From: Giulio Fidente <gfidente@redhat.com>
Date: Wed, 1 Jul 2015 10:32:05 +0000 (+0200)
Subject: Remove unwanted constraints between the Redis vip and Ceilometer
X-Git-Tag: opnfv-6.0.0~2456^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=6fa6fc622441651363b70824da02e62d6dc63684;p=apex-tripleo-heat-templates.git

Remove unwanted constraints between the Redis vip and Ceilometer

We do not want to delay Redis vip start to promotion of Redis master,
HAProxy will take care of the validating the backends.

We do not need to force colocation of Redis vip with Redis master.

We do not want to restart the Ceilometer central agent when the vip
moves this can instead cause unwanted cascading restarts due to other
constraints in between services.

More details can be read on the BZ at:
https://bugzilla.redhat.com/show_bug.cgi?id=1236374

Change-Id: I594984cd23db7de57746c3e1018181d61b020f46
---

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index a57465c0..6dbed840 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -261,22 +261,6 @@ if hiera('step') >= 2 {
           ip_address => $redis_vip,
         }
     }
-    pacemaker::constraint::base { 'redis-master-then-vip-redis':
-      constraint_type => 'order',
-      first_resource  => 'redis-master',
-      second_resource => "ip-${redis_vip}",
-      first_action    => 'promote',
-      second_action   => 'start',
-      require => [Pacemaker::Resource::Ocf['redis'],
-                  Pacemaker::Resource::Ip['vip-redis']],
-    }
-    pacemaker::constraint::colocation { 'vip-redis-with-redis-master':
-      source  => "ip-${redis_vip}",
-      target  => 'redis-master',
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Ocf['redis'],
-                  Pacemaker::Resource::Ip['vip-redis']],
-    }
 
   }
 
@@ -1221,15 +1205,6 @@ if hiera('step') >= 4 {
                             Pacemaker::Resource::Service[$::mongodb::params::service_name]],
       }
     }
-    pacemaker::constraint::base { 'vip-redis-then-ceilometer-central':
-      constraint_type => 'order',
-      first_resource  => "ip-${redis_vip}",
-      second_resource => "${::ceilometer::params::agent_central_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require => [Pacemaker::Resource::Service[$::ceilometer::params::agent_central_service_name],
-                  Pacemaker::Resource::Ip['vip-redis']],
-    }
 
     # Heat
     pacemaker::resource::service { $::heat::params::api_service_name :