From: Dan Prince <dprince@redhat.com>
Date: Mon, 1 Jun 2015 14:37:35 +0000 (-0400)
Subject: configure pacemaker VIPs for isolated networks
X-Git-Tag: opnfv-6.0.0~2508
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=92271fb0545bae0e4bd9aac2dfb0017e9bc6d919;p=apex-tripleo-heat-templates.git

configure pacemaker VIPs for isolated networks

This patch updates the overcloud pacemaker role manifest so
that it optionally configures VIPs on isolated networks if
they are enabled.

Change-Id: I6123ee622abe4d8d7b5f76cf9bac43acd80c1f64
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 05ea8752..ac05c367 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -160,6 +160,11 @@ if hiera('step') >= 1 {
 if hiera('step') >= 2 {
 
   if $pacemaker_master {
+
+    # FIXME: we should not have to access tripleo::loadbalancer class
+    # parameters here to configure pacemaker VIPs. The configuration
+    # of pacemaker VIPs could move into puppet-tripleo or we should
+    # make use of less specific hiera parameters here for the settings.
     $control_vip = hiera('tripleo::loadbalancer::controller_virtual_ip')
     pacemaker::resource::ip { 'control_vip':
       ip_address => $control_vip,
@@ -168,6 +173,28 @@ if hiera('step') >= 2 {
     pacemaker::resource::ip { 'public_vip':
       ip_address => $public_vip,
     }
+
+    $internal_api_vip = hiera('tripleo::loadbalancer::internal_api_virtual_ip')
+    if $internal_api_vip and $internal_api_vip != $control_vip {
+      pacemaker::resource::ip { 'internal_api_vip':
+        ip_address => $internal_api_vip,
+      }
+    }
+
+    $storage_vip = hiera('tripleo::loadbalancer::storage_virtual_ip')
+    if $storage_vip and $storage_vip != $control_vip {
+      pacemaker::resource::ip { 'storage_vip':
+        ip_address => $storage_vip,
+      }
+    }
+
+    $storage_mgmt_vip = hiera('tripleo::loadbalancer::storage_mgmt_virtual_ip')
+    if $storage_mgmt_vip and $storage_mgmt_vip != $control_vip {
+      pacemaker::resource::ip { 'storage_mgmt_vip':
+        ip_address => $storage_mgmt_vip,
+      }
+    }
+
     pacemaker::resource::service { 'haproxy':
       clone_params => true,
     }