summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-05-20 08:51:26 +0000
committerGerrit Code Review <review@openstack.org>2015-05-20 08:51:26 +0000
commit01935785109a3dbe09978b23b733c00011886d3f (patch)
treee2c4b83ce8014c9a109cf67ce9c15c40cb6c07dd
parent28466aae0d2fdd37d8e7c8462291216607f1a41e (diff)
parent5f83a28bd43c85ff4355cbc33071c1eb97d3816e (diff)
Merge "Enable VIPs via Pacemaker from step 2 instead of step 1"
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp22
1 files changed, 8 insertions, 14 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 9f266b6a..4b956bfb 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -64,20 +64,6 @@ if hiera('step') >= 1 {
class { '::pacemaker::stonith':
disable => true,
}
- if $pacemaker_master {
- $control_vip = hiera('tripleo::loadbalancer::controller_virtual_ip')
- pacemaker::resource::ip { 'control_vip':
- ip_address => $control_vip,
- }
- $public_vip = hiera('tripleo::loadbalancer::public_virtual_ip')
- pacemaker::resource::ip { 'public_vip':
- ip_address => $public_vip,
- }
- }
-
- Class['::pacemaker::corosync'] -> Pacemaker::Resource::Ip <| |>
- Class['::pacemaker::corosync'] -> Pacemaker::Resource::Ocf <| |>
- Class['::pacemaker::corosync'] -> Pacemaker::Resource::Service <| |>
# Only configure RabbitMQ in this step, don't start it yet to
# avoid races where non-master nodes attempt to start without
@@ -162,6 +148,14 @@ if hiera('step') >= 1 {
if hiera('step') >= 2 {
if $pacemaker_master {
+ $control_vip = hiera('tripleo::loadbalancer::controller_virtual_ip')
+ pacemaker::resource::ip { 'control_vip':
+ ip_address => $control_vip,
+ }
+ $public_vip = hiera('tripleo::loadbalancer::public_virtual_ip')
+ pacemaker::resource::ip { 'public_vip':
+ ip_address => $public_vip,
+ }
pacemaker::resource::service { 'haproxy':
clone_params => true,
}