From: Giulio Fidente <gfidente@redhat.com>
Date: Fri, 19 Jun 2015 02:31:10 +0000 (+0200)
Subject: Leave control of Redis balancing in static hieradata
X-Git-Tag: opnfv-6.0.0~2471^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7bed17dd63979dac48d3786bb4fb99570c013ebb;p=apex-tripleo-heat-templates.git

Leave control of Redis balancing in static hieradata

Redis balancing is controlled by static hieradata [1] we don't
need to override it into manifest.

1. https://github.com/openstack/tripleo-heat-templates/blob/master/puppet/hieradata/controller.yaml#L111

Change-Id: Ie2a5a4cbee0a55f2572f182b18c036efc299dbef
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index de9eac51..2327a9d3 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -55,7 +55,6 @@ if hiera('step') >= 1 {
   class { '::tripleo::loadbalancer' :
     controller_hosts       => $controller_node_ips,
     controller_hosts_names => $controller_node_names,
-    redis                  => true,
     manage_vip             => false,
     haproxy_service_manage => false,
   }