Drop duplicate neutron pacemaker constraint
authorDan Prince <dprince@redhat.com>
Fri, 3 Jun 2016 18:56:40 +0000 (14:56 -0400)
committerDan Prince <dprince@redhat.com>
Mon, 6 Jun 2016 01:39:00 +0000 (21:39 -0400)
Drop a duplicate keystone-to-neutron-server-constraint constraint
for the neutron server profile.

Change-Id: I928f9f9f3cf665ac80696f66e1d64ceb02129b8e

manifests/profile/pacemaker/neutron/server.pp

index 83e8a2a..f4fe083 100644 (file)
@@ -35,22 +35,9 @@ class tripleo::profile::pacemaker::neutron::server (
   include ::tripleo::profile::pacemaker::neutron
 
   if $step >= 5 {
-
     class { '::tripleo::profile::base::neutron::server':
       sync_db        => ($::hostname == downcase($pacemaker_master)),
     }
-
-    if ($::hostname == downcase($pacemaker_master)) {
-      pacemaker::constraint::base { 'keystone-to-neutron-server-constraint':
-        constraint_type => 'order',
-        first_resource  => 'openstack-core-clone',
-        second_resource => "${::neutron::params::server_service}-clone",
-        first_action    => 'start',
-        second_action   => 'start',
-        require         => [Pacemaker::Resource::Ocf['openstack-core'],
-                            Pacemaker::Resource::Service[$::neutron::params::server_service]],
-      }
-    }
-
   }
+
 }