diff options
author | Jenkins <jenkins@review.openstack.org> | 2016-05-18 09:44:24 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2016-05-18 09:44:24 +0000 |
commit | d6574fa32a0954aea02684984d9a93c444ec34f0 (patch) | |
tree | 333ee97f026707a4726bc3f03fe64a25f160239f /puppet/services/pacemaker/neutron-dhcp.yaml | |
parent | 9223f5d2613102505a02334300134190527f1d9f (diff) | |
parent | a3bae06b2eeb934d7da52440f24a576b5acddbec (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.yaml | 2 |
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 |