From: Dan Prince <dprince@redhat.com>
Date: Wed, 8 Jun 2016 13:56:09 +0000 (-0400)
Subject: Drop the neutron dnsmasq config file options
X-Git-Tag: opnfv-6.0.0~687^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=94b0f6352c3e8a258da37feb58c25704bf55380e;p=apex-puppet-tripleo.git

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
---

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' |>
   }
 }