From f3c4e23c90ee73de2b4f8d682d5c14bf3266f18a Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Fri, 3 Jun 2016 14:56:40 -0400 Subject: Drop duplicate neutron pacemaker constraint Drop a duplicate keystone-to-neutron-server-constraint constraint for the neutron server profile. Change-Id: I928f9f9f3cf665ac80696f66e1d64ceb02129b8e --- manifests/profile/pacemaker/neutron/server.pp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'manifests/profile/pacemaker') diff --git a/manifests/profile/pacemaker/neutron/server.pp b/manifests/profile/pacemaker/neutron/server.pp index 83e8a2a..f4fe083 100644 --- a/manifests/profile/pacemaker/neutron/server.pp +++ b/manifests/profile/pacemaker/neutron/server.pp @@ -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]], - } - } - } + } -- cgit 1.2.3-korg