summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/neutron
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-13 08:07:55 +0000
committerGerrit Code Review <review@openstack.org>2016-07-13 08:07:55 +0000
commit36031336d2ccf818cb6820fc5e57cb6ef14de0e8 (patch)
treeaf0ccecfd9be6ba0a7251e414d18955a8aa93dcf /manifests/profile/base/neutron
parentd640ee35b846b90f41bcac179fcb5c8dac8f748a (diff)
parent94b0f6352c3e8a258da37feb58c25704bf55380e (diff)
Merge "Drop the neutron dnsmasq config file options"
Diffstat (limited to 'manifests/profile/base/neutron')
-rw-r--r--manifests/profile/base/neutron/dhcp.pp13
1 files changed, 0 insertions, 13 deletions
diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp
index 180fd37..a313478 100644
--- a/manifests/profile/base/neutron/dhcp.pp
+++ b/manifests/profile/base/neutron/dhcp.pp
@@ -18,31 +18,18 @@
#
# === Parameters
#
-# [*neutron_dnsmasq_options*]
-# (Optional)
-# Defaults to hiera('neutron_dnsmasq_options')
-#
# [*step*]
# (Optional) The current step in deployment. See tripleo-heat-templates
# for more details.
# Defaults to hiera('step')
#
class tripleo::profile::base::neutron::dhcp (
- $neutron_dnsmasq_options = hiera('neutron_dnsmasq_options', ''),
$step = hiera('step'),
) {
if $step >= 4 {
include ::tripleo::profile::base::neutron
include ::neutron::agents::dhcp
- file { '/etc/neutron/dnsmasq-neutron.conf':
- content => $neutron_dnsmasq_options,
- owner => 'neutron',
- group => 'neutron',
- notify => Service['neutron-dhcp-service'],
- require => Package['neutron'],
- }
-
Service<| title == 'neutron-server' |> -> Service <| title == 'neutron-dhcp' |>
}
}