summaryrefslogtreecommitdiffstats
path: root/manifests/profile/base
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2016-06-08 09:56:09 -0400
committerDan Prince <dprince@redhat.com>2016-06-11 06:46:17 -0400
commit94b0f6352c3e8a258da37feb58c25704bf55380e (patch)
tree4655ff6a30d1eaeabcf6e4da8707c32a7ef550e8 /manifests/profile/base
parent806b9879c948462d381f8924616205e37e0e3785 (diff)
Drop the neutron dnsmasq config file options
Drop this because Mitaka neutron no longer requires configuration of the tenant MTU. Depends-On: I540ba5dc69d0506f71b59746efcce94c73f9317f Change-Id: I2afeb94e676aed952063abfcadee67bcc50eded9
Diffstat (limited to 'manifests/profile/base')
-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' |>
}
}