summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-30 10:00:14 +0000
committerGerrit Code Review <review@openstack.org>2016-05-30 10:00:14 +0000
commit2b6c7dbefff4b1fcab36f3fbc105d63187c54ac5 (patch)
tree00e745921f8bf1dcbf2bdfa5cdd59f4339d5892a /puppet/services
parenta6438a2082792e7528bfed682c64e352367f8f6f (diff)
parent3fc7da4b577af3d5c00c08a3e044a9cbb5a5e430 (diff)
Merge "Pass enabled and manage_service to Neutron/L3 when Pacemaker"
Diffstat (limited to 'puppet/services')
-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 73ea9d8d..cb9c32d9 100644
--- a/puppet/services/pacemaker/neutron-l3.yaml
+++ b/puppet/services/pacemaker/neutron-l3.yaml
@@ -25,5 +25,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