diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-18 20:15:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-18 20:15:27 +0000 |
| commit | 882ee42f4a35010259c6f2bec1847946e76f3718 (patch) | |
| tree | 201977adf0965036e1764596a558b3d895bd4879 /puppet/manifests/overcloud_controller_pacemaker.pp | |
| parent | f74890a8dc270d035fe111c203a412b076f56033 (diff) | |
| parent | d02beabc0af6b4843f7b4bbd759f1ba4252562b8 (diff) | |
Merge "Enable loadbalancing of the Redis VIP, defaults to False"
Diffstat (limited to 'puppet/manifests/overcloud_controller_pacemaker.pp')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 4ef395f2..de9eac51 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -55,7 +55,7 @@ if hiera('step') >= 1 { class { '::tripleo::loadbalancer' : controller_hosts => $controller_node_ips, controller_hosts_names => $controller_node_names, - redis => false, + redis => true, manage_vip => false, haproxy_service_manage => false, } @@ -674,7 +674,6 @@ if hiera('step') >= 3 { class { '::ceilometer::agent::central' : manage_service => false, enabled => false, - coordination_url => "redis://${redis_vip}:6379", } class { '::ceilometer::alarm::notifier' : manage_service => false, |