From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Fri, 7 Dec 2018 07:32:09 +0000 (+0000)
Subject: Revert "Revert "Conform configs to updated Redis v5.0 package""
X-Git-Tag: opnfv-7.1.0~11
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4bbd4d019f40548c43f38c0e6990d3089ba6b368;p=fuel.git

Revert "Revert "Conform configs to updated Redis v5.0 package""

This reverts commit 86c0ba63236b96fbf38370280d85a23290b19680.
The package of Redis v5.0 has been returned back to repository.

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

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 fad9052cc..7f2f269a7 100644
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_telemetry.yml.j2
@@ -49,7 +49,7 @@ parameters:
           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 e9bb1357f..2891664d3 100644
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2
@@ -165,7 +165,7 @@ parameters:
       ~database: ~
   redis:
     server:
-      version: 3.0
+      version: 5.0
       appendfsync: 'no'
       bind:
         address: ${_param:single_address}