diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-05-18 09:52:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-05-18 09:52:16 +0000 |
| commit | 93eeb887a7bae59c43c9e864c20d3c844592f68b (patch) | |
| tree | 95f13fce2bc632a2d2c3f49eada534a24dfbfed8 /manifests/profile/base/neutron/dhcp.pp | |
| parent | a555a26421deda2f601e2127a9ecaf0b4590a11f (diff) | |
| parent | 837643416d6fc636336d74b1da800a295c3d49a3 (diff) | |
Merge "Remove manage_service and enabled from TripleO manifests"
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 4d5bb28..180fd37 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 file { '/etc/neutron/dnsmasq-neutron.conf': content => $neutron_dnsmasq_options, |