aboutsummaryrefslogtreecommitdiffstats
path: root/manifests
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-06 13:49:23 +0000
committerGerrit Code Review <review@openstack.org>2016-06-06 13:49:23 +0000
commit806b9879c948462d381f8924616205e37e0e3785 (patch)
treed93733d02cf5e1b6c73d8205ca0ec976ef835e80 /manifests
parent4e2e8a0aebefd84bc302073978f0e4100fc2362c (diff)
parentf3c4e23c90ee73de2b4f8d682d5c14bf3266f18a (diff)
Merge "Drop duplicate neutron pacemaker constraint"
Diffstat (limited to 'manifests')
-rw-r--r--manifests/profile/pacemaker/neutron/server.pp15
1 files changed, 1 insertions, 14 deletions
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]],
- }
- }
-
}
+
}