Conform configs to updated Redis v5.0 package

Also disable transparent hugepages on telemetry hosted nodes
to avoid latency and memory usage issues with Redis.

Change-Id: I3c7a0be6edbc51141f5d79d7368583afacef9025
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/.gitmodules b/.gitmodules
index e1d8011..fbf1927 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,7 @@
        path = mcp/salt-formulas/salt-formula-maas
        url = https://github.com/salt-formulas/salt-formula-maas
        branch = master
+[submodule "salt-formula-redis"]
+       path = mcp/salt-formulas/salt-formula-redis
+       url = https://gerrit.mcp.mirantis.com/salt-formulas/redis
+       branch = master

diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
index 5ad57bb..9a0a0cf 100644 (file)
--- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
+++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch
@@ -20,20 +20,26 @@ Subject: [PATCH] OPNFV package installation, Ubuntu user
   `salt_minion_reclass_dependencies`;
 
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- DockerMake.yml | 36 +++++++++++++++++++++++++++++++++++-
- 1 file changed, 35 insertions(+), 1 deletion(-)
 
 diff --git a/DockerMake.yml b/DockerMake.yml
-index 2c75586..d7d4c49 100644
+index 2c75586..13813a2 100644
 --- a/DockerMake.yml
 +++ b/DockerMake.yml
+@@ -94,7 +94,7 @@ salt-formulas:
+   build: |
+     ARG SALT_FORMULA_VERSION="master"
+     ENV SALT_FORMULA_VERSION $SALT_FORMULA_VERSION
+-    ARG SALT_FORMULA_SOURCES="https://github.com/salt-formulas https://github.com/saltstack-formulas"
++    ARG SALT_FORMULA_SOURCES="https://github.com/salt-formulas"
+     ENV SALT_FORMULA_SOURCES $SALT_FORMULA_SOURCES
+     ARG SALT_FORMULAS_BASE="/srv/salt/formula"
+     ENV SALT_FORMULAS_BASE $SALT_FORMULAS_BASE
 @@ -102,12 +102,46 @@ salt-formulas:
      ENV SALT_ENV_PATH_ $SALT_ENV_PATH_
      ARG RECLASS_BASE="/srv/salt/reclass"
      ENV RECLASS_BASE $RECLASS_BASE
 -    RUN echo "Layer python/salt module prerequisites, formulas" \
-+    RUN echo "Layer python/salt module prerequisites, formulas (29 Oct 2018)" \
++    RUN echo "Layer python/salt module prerequisites, formulas (09 Nov 2018)" \
        && mkdir -p /srv/salt \
        && curl -sSqL https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/formula-fetch.sh -o /srv/salt/formula-fetch.sh \
        && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
index 9a9144c..7f2f269 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
@@ -42,9 +42,14 @@ parameters:
     openstack_telemetry_redis_url: redis://${_param:redis_sentinel_node01_address}:26379?sentinel=master_1&sentinel_fallback=${_param:redis_sentinel_node02_address}:26379&sentinel_fallback=${_param:redis_sentinel_node03_address}:26379
     gnocchi_coordination_url: ${_param:openstack_telemetry_redis_url}
     gnocchi_storage_incoming_redis_url: ${_param:openstack_telemetry_redis_url}
+  linux:
+    system:
+      sysfs:
+        transparent_hugepages:
+          kernel/mm/transparent_hugepage/enabled: never
   redis:
     server:
-      version: 3.0
+      version: 5.0
       appendfsync: 'no'
       bind:
         address: ${_param:single_address}

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
index 999fa79..2891664 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -81,6 +81,9 @@ parameters:
       package:
         python-msgpack:
           version: latest
+      sysfs:
+        transparent_hugepages:
+          kernel/mm/transparent_hugepage/enabled: never
   keystone:
     server:
       admin_email: ${_param:admin_email}
@@ -162,7 +165,7 @@ parameters:
       ~database: ~
   redis:
     server:
-      version: 3.0
+      version: 5.0
       appendfsync: 'no'
       bind:
         address: ${_param:single_address}

diff --git a/mcp/salt-formulas/salt-formula-redis b/mcp/salt-formulas/salt-formula-redis
new file mode 160000 (submodule)
index 0000000..e6426b6
--- /dev/null
+++ b/mcp/salt-formulas/salt-formula-redis
@@ -0,0 +1 @@
+Subproject commit e6426b6a271b87e90a1c31ddcca36e5449383c4f