From 8ff573af9ccf5fa49ad640395050e1c33da2a233 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Thu, 2 Oct 2014 16:10:52 +0200
Subject: [PATCH] Rename VIP resources

DocImpact
Related blueprint pacemaker-improvements

Change-Id: Ica5498ebda1e24e3fbc9011c4c703fe31eab112d
Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
 deployment/puppet/cluster/manifests/haproxy_ocf.pp      | 4 ++--
 deployment/puppet/mysql/manifests/server.pp             | 4 ++--
 deployment/puppet/osnailyfacter/manifests/cluster_ha.pp | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/deployment/puppet/cluster/manifests/haproxy_ocf.pp b/deployment/puppet/cluster/manifests/haproxy_ocf.pp
index 23fd0e1137..9142ab9667 100644
--- a/deployment/puppet/cluster/manifests/haproxy_ocf.pp
+++ b/deployment/puppet/cluster/manifests/haproxy_ocf.pp
@@ -56,7 +56,7 @@ class cluster::haproxy_ocf (
       ensure     => present,
       score      => 'INFINITY',
       primitives => [
-          "vip__public_old",
+          "vip__public",
           "clone_${service_name}"
       ],
     }
@@ -64,7 +64,7 @@ class cluster::haproxy_ocf (
       ensure     => present,
       score      => 'INFINITY',
       primitives => [
-          "vip__management_old",
+          "vip__management",
           "clone_${service_name}"
       ],
     }
diff --git a/deployment/puppet/mysql/manifests/server.pp b/deployment/puppet/mysql/manifests/server.pp
index eb6fe4a3a1..f149b5b4d4 100644
--- a/deployment/puppet/mysql/manifests/server.pp
+++ b/deployment/puppet/mysql/manifests/server.pp
@@ -206,9 +206,9 @@ class mysql::server (
       provider => 'pacemaker',
     }
 
-    #Tie vip__management_old to p_mysqld
+    #Tie vip__management to p_mysqld
     cs_colocation { 'mysql_to_internal-vip':
-      primitives => ['vip__management_old',"master_p_${service_name}:Master"],
+      primitives => ['vip__management',"master_p_${service_name}:Master"],
       score      => 'INFINITY',
       require    => [Cs_resource["p_${service_name}"], Cs_commit['mysql']],
     }
diff --git a/deployment/puppet/osnailyfacter/manifests/cluster_ha.pp b/deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
index 67e9b4b25f..60df7afa20 100644
--- a/deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
+++ b/deployment/puppet/osnailyfacter/manifests/cluster_ha.pp
@@ -119,7 +119,7 @@ class osnailyfacter::cluster_ha {
   $vip_public_cidr_netmask = netmask_to_cidr($primary_controller_nodes[0]['public_netmask'])
 
   $vips = { # Do not convert to ARRAY, It can't work in 2.7
-    management_old   => {
+    management   => {
       namespace            => 'haproxy',
       nic                  => $::internal_int,
       base_veth            => "${::internal_int}-hapr",
@@ -137,7 +137,7 @@ class osnailyfacter::cluster_ha {
   }
 
   if $::public_int {
-    $vips[public_old] = {
+    $vips[public] = {
       namespace            => 'haproxy',
       nic                  => $::public_int,
       base_veth            => "${::public_int}-hapr",