summaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-04-20 07:20:07 -0400
committerGiulio Fidente <gfidente@redhat.com>2015-04-27 14:29:25 +0200
commit5d3b70fbb878a1da6ac414fe8532227cac6fb912 (patch)
tree94efe319b75b2b32ef81e849571a4b755b80b08f /puppet/manifests
parent723db1317cd62a8772c764847c80a339eae4c03f (diff)
Switch VIP management from Keepalived to Pacemaker
Change-Id: I45511569fda6b00ca35b1e590537a29271e56ce0 Depends-On: I98b9b3dbc48009ce255d964ac580e1a31f279f1e
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller.pp11
1 files changed, 11 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index b1ccf3d7..505d4f5e 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -32,6 +32,7 @@ if hiera('step') >= 1 {
class { '::tripleo::loadbalancer' :
controller_hosts => $controller_node_ips,
+ manage_vip => $enable_keepalived,
}
if $enable_pacemaker {
@@ -54,6 +55,16 @@ 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,
+ }
+ }
}
}