diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2016-05-06 19:38:29 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2016-05-09 12:31:30 +0200 |
| commit | 837643416d6fc636336d74b1da800a295c3d49a3 (patch) | |
| tree | e890298646a732d2dc415c14b3a84d9758892297 /manifests/profile/base/neutron/dhcp.pp | |
| parent | 01ffa0be0060dd10dcfe23121635708c2e697a89 (diff) | |
Remove manage_service and enabled from TripleO manifests
These can be controlled via the specific Pacemaker role template.
Depends-On: I91a4267f0fc230f63df3333747d28463c7ae55fe
Change-Id: I8ef7bb94e048b998712b3534ceb51a7d10d016e9
Diffstat (limited to 'manifests/profile/base/neutron/dhcp.pp')
| -rw-r--r-- | manifests/profile/base/neutron/dhcp.pp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp index 1d7cc10..534026e 100644 --- a/manifests/profile/base/neutron/dhcp.pp +++ b/manifests/profile/base/neutron/dhcp.pp @@ -22,14 +22,6 @@ # (Optional) # Defaults to hiera('neutron_dnsmasq_options') # -# [*enabled*] -# (Optional) Whether to enable the Neutron DHCP Agent service -# Defaults to undef -# -# [*manage_service*] -# (Optional) Whether to manage the Neutron DHCP Agent service -# Defaults to undef -# # [*step*] # (Optional) The current step in deployment. See tripleo-heat-templates # for more details. @@ -37,16 +29,11 @@ # class tripleo::profile::base::neutron::dhcp ( $neutron_dnsmasq_options = hiera('neutron_dnsmasq_options', ''), - $enabled = undef, - $manage_service = undef, $step = hiera('step'), ) { if $step >= 4 { include ::tripleo::profile::base::neutron - class { '::neutron::agents::dhcp': - manage_service => $manage_service, - enabled => $enabled - } + include ::neutron::agents::dhcp Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-dhcp' |> } |