Switch VIP management from Keepalived to Pacemaker

Change-Id: I45511569fda6b00ca35b1e590537a29271e56ce0
Depends-On: I98b9b3dbc48009ce255d964ac580e1a31f279f1e

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index b1ccf3d..505d4f5 100644 (file)
--- 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,
+      }
+    }
   }
 
 }