aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/salt-formula-horizon
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/patches/salt-formula-horizon')
-rw-r--r--mcp/patches/salt-formula-horizon/0001-Support-stein-version.patch7
-rw-r--r--mcp/patches/salt-formula-horizon/0002-Align-packages-with-Stein-reqs.patch30
2 files changed, 37 insertions, 0 deletions
diff --git a/mcp/patches/salt-formula-horizon/0001-Support-stein-version.patch b/mcp/patches/salt-formula-horizon/0001-Support-stein-version.patch
index 8c9aab91b..3ae93638d 100644
--- a/mcp/patches/salt-formula-horizon/0001-Support-stein-version.patch
+++ b/mcp/patches/salt-formula-horizon/0001-Support-stein-version.patch
@@ -10,6 +10,13 @@ From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 9 Jul 2019 14:54:50 +0400
Subject: [PATCH] Support stein version
+---
+ horizon/files/local_settings/stein_settings.py | 1 +
+ horizon/files/policy/stein | 1 +
+ 2 files changed, 2 insertions(+)
+ create mode 120000 horizon/files/local_settings/stein_settings.py
+ create mode 120000 horizon/files/policy/stein
+
diff --git a/horizon/files/local_settings/stein_settings.py b/horizon/files/local_settings/stein_settings.py
new file mode 120000
index 0000000..183e9a8
diff --git a/mcp/patches/salt-formula-horizon/0002-Align-packages-with-Stein-reqs.patch b/mcp/patches/salt-formula-horizon/0002-Align-packages-with-Stein-reqs.patch
new file mode 100644
index 000000000..90a0057cb
--- /dev/null
+++ b/mcp/patches/salt-formula-horizon/0002-Align-packages-with-Stein-reqs.patch
@@ -0,0 +1,30 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2019 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Mon, 30 Dec 2019 16:15:04 +0100
+Subject: [PATCH] Align packages with Stein reqs
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ horizon/map.jinja | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/horizon/map.jinja b/horizon/map.jinja
+index 3779d69..0cebe0c 100644
+--- a/horizon/map.jinja
++++ b/horizon/map.jinja
+@@ -6,7 +6,7 @@
+
+ {%- if not salt['pillar.get']('horizon:server:cache:backend') %}
+ {%- if salt['pillar.get']('horizon:server:version') not in ['mitaka','newton'] %}
+- {%- set cache_pkgs = ['python-pylibmc'] %}
++ {%- set cache_pkgs = ['python3-pylibmc'] %}
+ {%- set default_cache_backend = 'django.core.cache.backends.memcached.PyLibMCCache' %}
+ {%- else %}
+ {% if grains['os_family'] == 'RedHat' %}