From: Dan Prince <dprince@redhat.com>
Date: Wed, 11 May 2016 01:49:00 +0000 (-0400)
Subject: Add the neutron-dnsmasq.conf to neutron profile
X-Git-Tag: opnfv-6.0.0~770^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4966c016bbf0b4c5015268a5f14ae173f4627ada;p=apex-puppet-tripleo.git

Add the neutron-dnsmasq.conf to neutron profile

This was in the initial neutron profile patches but got removed
mid-way (see patch 16 comments here:
Ida781badbcd63bbcb481a2170638aefe262b717b). The file is in fact
required in order to get the ping test properly passing with TripleO.

Change-Id: Ibbfd79421f871e41f870745a593cca65e8c0e58a
---

diff --git a/manifests/profile/base/neutron/dhcp.pp b/manifests/profile/base/neutron/dhcp.pp
index 1d7cc10..4d5bb28 100644
--- a/manifests/profile/base/neutron/dhcp.pp
+++ b/manifests/profile/base/neutron/dhcp.pp
@@ -48,6 +48,14 @@ class tripleo::profile::base::neutron::dhcp (
       enabled        => $enabled
     }
 
+    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' |>
   }
 }