summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-05-18 19:06:46 +0200
committerGiulio Fidente <gfidente@redhat.com>2016-05-18 19:06:46 +0200
commit3fc7da4b577af3d5c00c08a3e044a9cbb5a5e430 (patch)
tree041dcb16e4c8ab670f63c19eb27e2e7074b0922b /puppet
parent168bc2f6ff7310db6dc4cf957fdbb121419a3fcf (diff)
Pass enabled and manage_service to Neutron/L3 when Pacemaker
We can drive enabled and manage_service from the Pacemaker specific templates so change I8ef7bb94e048b998712b3534ceb51a7d10d016e9 removed that logic from the TripleO specific manifests. This change adds them into the Pacemaker template for the Neutron/L3 agent. Change-Id: I1146a8bae4938577e9927d1ce74009e066cb58dd
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/pacemaker/neutron-l3.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/services/pacemaker/neutron-l3.yaml b/puppet/services/pacemaker/neutron-l3.yaml
index 84bff808..cbe2ddbe 100644
--- a/puppet/services/pacemaker/neutron-l3.yaml
+++ b/puppet/services/pacemaker/neutron-l3.yaml
@@ -29,5 +29,7 @@ outputs:
map_merge:
- get_attr: [NeutronL3Base, role_data, config_settings]
- tripleo::profile::pacemaker::neutron::enable_l3: True
+ neutron::agents::l3::enabled: false
+ neutron::agents::l3::manage_service: false
step_config: |
include ::tripleo::profile::pacemaker::neutron::l3