diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-23 09:12:12 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-23 09:12:12 +0000 |
| commit | ce51c10e64ae91e286e3bef63fb7e8a30e76bab7 (patch) | |
| tree | 1d3bf6ec5ebc89279c1ce4b133edb67549392811 /puppet/manifests | |
| parent | 81cc928ecae674b9c1806b406798cc5cccf5fe4b (diff) | |
| parent | 7bed17dd63979dac48d3786bb4fb99570c013ebb (diff) | |
Merge "Leave control of Redis balancing in static hieradata"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 5c45ed14..ed4f3512 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, } |