aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/pacemaker/neutron-dhcp.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-05-18 09:44:24 +0000
committerGerrit Code Review <review@openstack.org>2016-05-18 09:44:24 +0000
commitd6574fa32a0954aea02684984d9a93c444ec34f0 (patch)
tree333ee97f026707a4726bc3f03fe64a25f160239f /puppet/services/pacemaker/neutron-dhcp.yaml
parent9223f5d2613102505a02334300134190527f1d9f (diff)
parenta3bae06b2eeb934d7da52440f24a576b5acddbec (diff)
Merge "Ensure manage_service and enabled are false for Pacemaker"
Diffstat (limited to 'puppet/services/pacemaker/neutron-dhcp.yaml')
-rw-r--r--puppet/services/pacemaker/neutron-dhcp.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/services/pacemaker/neutron-dhcp.yaml b/puppet/services/pacemaker/neutron-dhcp.yaml
index 4be711ca..0e972b28 100644
--- a/puppet/services/pacemaker/neutron-dhcp.yaml
+++ b/puppet/services/pacemaker/neutron-dhcp.yaml
@@ -29,5 +29,7 @@ outputs:
map_merge:
- get_attr: [NeutronDhcpBase, role_data, config_settings]
- tripleo::profile::pacemaker::neutron::enable_dhcp: True
+ neutron::agents::dhcp::enabled: false
+ neutron::agents::dhcp::manage_service: false
step_config: |
include ::tripleo::profile::pacemaker::neutron::dhcp