diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-04-07 10:57:38 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-04-14 18:53:57 +0000 |
| commit | 887f35b0f1fcc2218636564948f36170ed077934 (patch) | |
| tree | 95fbada70d22fa37f1fe8cfde0a4ce52e3b2312a /puppet | |
| parent | d600cb4c5edba1b38406f70dc0bd45139078bda3 (diff) | |
Fix Neutron enable_*_agent* Hiera parameters
This change will fix a logic error when L3 agent was disabled, where
a Pacemaker constraint (neutron-dhcp-agent-to-l3-agent-constraint) were
still looking for l3_agent_service in the Puppet catalog, but could not
because L3 agent was disabled.
It was sending this Puppet error:
Error: Could not find dependency
Pacemaker::Resource::Service[neutron-l3-agent] for
Pacemaker::Constraint::Base[neutron-dhcp-agent-to-l3-agent-constraint]
Change-Id: I0e5d24d844810c58a3205303399d1c20773af3dd
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index f152a141..53afc08b 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -1351,7 +1351,7 @@ if hiera('step') >= 5 { Pacemaker::Resource::Service[$::neutron::params::dhcp_agent_service]], } } - if hiera('neutron::enable_dhcp_agent',true) and hiera('l3_agent_service',true) { + if hiera('neutron::enable_dhcp_agent',true) and hiera('neutron::enable_l3_agent',true) { pacemaker::constraint::base { 'neutron-dhcp-agent-to-l3-agent-constraint': constraint_type => 'order', first_resource => "${::neutron::params::dhcp_agent_service}-clone", |