aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/manifests
diff options
context:
space:
mode:
authormarios <marios@redhat.com>2015-07-02 18:04:37 +0300
committermarios <marios@redhat.com>2015-07-02 18:04:37 +0300
commit1ca7efc5d18c4b5ba5f53753dcfbbe790c42aaad (patch)
tree072fe96b78833e3d91871ef59759ee03b6547fca /puppet/manifests
parent20536bc2e1eec5926df479d1fbc124df766b8ac0 (diff)
Removes the NeutronScale resource from controller pcmk manifest
As reported in https://bugzilla.redhat.com/show_bug.cgi?id=1238117 and https://bugzilla.redhat.com/show_bug.cgi?id=1236578 the NeutronScale resource is causing problems during post deploy configuration of the overcloud (momentary inconsistency in the host name for the neutron agents, given what NeutronScale does, discussion in BZ 1238117). As discussed in the bugs, we may not need NeutronScale, since our host names should be safe enough for scaling. This change removes neutron scale completely and links startup of neutron-server directly to neutron-ovs-cleanup. If we can safely remove the NeutronScale resource then this change does that. Change-Id: Ib43a2d60b85fd9bb48eff5919602bb74dc463905
Diffstat (limited to 'puppet/manifests')
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp24
1 files changed, 2 insertions, 22 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 3d693313..045702d8 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -877,10 +877,6 @@ if hiera('step') >= 4 {
ocf_agent_name => "neutron:NetnsCleanup",
clone_params => "interleave=true",
}
- pacemaker::resource::ocf { 'neutron-scale':
- ocf_agent_name => "neutron:NeutronScale",
- clone_params => "globally-unique=true clone-max=3 interleave=true",
- }
pacemaker::constraint::base { 'keystone-to-neutron-server-constraint':
constraint_type => "order",
first_resource => "${::keystone::params::service_name}-clone",
@@ -890,29 +886,13 @@ if hiera('step') >= 4 {
require => [Pacemaker::Resource::Service[$::keystone::params::service_name],
Pacemaker::Resource::Service[$::neutron::params::server_service]],
}
- pacemaker::constraint::base { 'neutron-server-to-neutron-scale-constraint':
+ pacemaker::constraint::base { 'neutron-server-to-neutron-ovs-cleanup-constraint':
constraint_type => "order",
first_resource => "${::neutron::params::server_service}-clone",
- second_resource => "neutron-scale-clone",
- first_action => "start",
- second_action => "start",
- require => [Pacemaker::Resource::Service[$::neutron::params::server_service],
- Pacemaker::Resource::Ocf['neutron-scale']],
- }
- pacemaker::constraint::base { 'neutron-scale-to-ovs-cleanup-constraint':
- constraint_type => "order",
- first_resource => "neutron-scale-clone",
second_resource => "${::neutron::params::ovs_cleanup_service}-clone",
first_action => "start",
second_action => "start",
- require => [Pacemaker::Resource::Ocf['neutron-scale'],
- Pacemaker::Resource::Ocf["${::neutron::params::ovs_cleanup_service}"]],
- }
- pacemaker::constraint::colocation { 'neutron-scale-to-ovs-cleanup-colocation':
- source => "${::neutron::params::ovs_cleanup_service}-clone",
- target => "neutron-scale-clone",
- score => "INFINITY",
- require => [Pacemaker::Resource::Ocf['neutron-scale'],
+ require => [Pacemaker::Resource::Service[$::neutron::params::server_service],
Pacemaker::Resource::Ocf["${::neutron::params::ovs_cleanup_service}"]],
}
pacemaker::constraint::base { 'neutron-ovs-cleanup-to-netns-cleanup-constraint':