From 439a674e51b78141e57c0390cfcae403ab130fc8 Mon Sep 17 00:00:00 2001
From: Numan Siddique <nusiddiq@redhat.com>
Date: Sun, 11 Jun 2017 06:00:43 +0530
Subject: Do not create VIP for pacemaker OVN OCF resource

The commit with change id [1], added the pacemaker HA support
for OVN DB servers. That commit created a new VIP which is
really not required.

This patch removes the code to create a new ip resource. Instead
it expects the pacemaker ip resource (with the ip address in the
'ovn_dbs_vip' parameter and with the name "ip-$ovn_dbs_vip") to be
created before ovn_northd class is called, which is the case anyway
if 'ovn_dbs_vip' is taken from the ServiceNetMapDefaults (in t-h-t).

[1] - I9dc366002ef5919339961e5deebbf8aa815c73db

Change-Id: I94d3960e6c5406e3af309cc8c787ac0a6c9b1756
Partial-bug: #1670564
---
 manifests/profile/pacemaker/ovn_northd.pp | 36 ++++++-------------------------
 1 file changed, 7 insertions(+), 29 deletions(-)

(limited to 'manifests/profile/pacemaker')

diff --git a/manifests/profile/pacemaker/ovn_northd.pp b/manifests/profile/pacemaker/ovn_northd.pp
index af946af..57bbc35 100644
--- a/manifests/profile/pacemaker/ovn_northd.pp
+++ b/manifests/profile/pacemaker/ovn_northd.pp
@@ -32,7 +32,8 @@
 #   Defaults to hiera('pcs_tries', 20)
 #
 # [*ovn_dbs_vip*]
-#   (Optional) The OVN database virtual IP to be managed by the pacemaker.
+#   (Optional) The vip to be used for OVN DB servers. It is expected that
+#   the vip resource to be created before calling this class.
 #   Defaults to hiera('ovn_dbs_vip')
 #
 # [*nb_db_port*]
@@ -67,21 +68,9 @@ class tripleo::profile::pacemaker::ovn_northd (
     $ovndb_servers_ocf_name      = 'ovn:ovndb-servers'
     $ovndb_vip_resource_name     = "ip-${ovn_dbs_vip}"
 
-    if is_ipv6_address($ovn_dbs_vip) {
-      $netmask = '128'
-      $nic     = interface_for_ip($ovn_dbs_vip)
-    } else {
-      $netmask = '32'
-      $nic     = ''
-    }
-
-    pacemaker::resource::ip { "${ovndb_vip_resource_name}":
-      ip_address   => $ovn_dbs_vip,
-      cidr_netmask => $netmask,
-      nic          => $nic,
-      tries        => $pcs_tries,
-    }
-
+    # By step 3, all the VIPs would have been created.
+    # After creating ovn ocf resource, colocate it with the
+    # VIP - ip-${ovn_dbs_vip}.
     pacemaker::resource::ocf { "${ovndb_servers_resource_name}":
       ocf_agent_name  => "${ovndb_servers_ocf_name}",
       master_params   => '',
@@ -96,15 +85,6 @@ class tripleo::profile::pacemaker::ovn_northd (
       meta_params     => 'notify=true'
     }
 
-    pacemaker::constraint::order { "${ovndb_vip_resource_name}-then-${ovndb_servers_resource_name}":
-      first_resource    => "${ovndb_vip_resource_name}",
-      second_resource   => "${ovndb_servers_resource_name}-master",
-      first_action      => 'start',
-      second_action     => 'start',
-      constraint_params => 'kind=Mandatory',
-      tries             => $pcs_tries,
-    }
-
     pacemaker::constraint::colocation { "${ovndb_vip_resource_name}-with-${ovndb_servers_resource_name}":
       source       => "${ovndb_vip_resource_name}",
       target       => "${ovndb_servers_resource_name}-master",
@@ -113,9 +93,7 @@ class tripleo::profile::pacemaker::ovn_northd (
       tries        => $pcs_tries,
     }
 
-    Pacemaker::Resource::Ip["${ovndb_vip_resource_name}"] ->
-      Pacemaker::Resource::Ocf["${ovndb_servers_resource_name}"] ->
-        Pacemaker::Constraint::Order["${ovndb_vip_resource_name}-then-${ovndb_servers_resource_name}"] ->
-          Pacemaker::Constraint::Colocation["${ovndb_vip_resource_name}-with-${ovndb_servers_resource_name}"]
+    Pacemaker::Resource::Ocf["${ovndb_servers_resource_name}"] ->
+      Pacemaker::Constraint::Colocation["${ovndb_vip_resource_name}-with-${ovndb_servers_resource_name}"]
   }
 }
-- 
cgit 1.2.3-korg