aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/overcloud_controller.pp
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-02-01 13:40:23 -0500
committerDan Prince <dprince@redhat.com>2015-02-04 09:33:13 -0500
commita5be320a86dfe2ea92d42ca4b93dba81b6bf1d35 (patch)
tree81a772286f520e84d5074089ccfa590309976f4a /puppet/overcloud_controller.pp
parent8ca552d33b0da248ee37452833888424d01e3c56 (diff)
Puppet: wire in neutron_dnsmasq_options
This patch updates puppet on the controller so that it configures the Neutron dnsmasq options file data with the value provided by the Heat NeutronDnsmasqOptions parameter. Properly configuring this setting can help resolve/tune overcloud instance connectivity issues w/ SSH etc. Change-Id: If47ab3d3002ebe19fc980ca5d37f84f4d8851f9b
Diffstat (limited to 'puppet/overcloud_controller.pp')
-rw-r--r--puppet/overcloud_controller.pp8
1 files changed, 8 insertions, 0 deletions
diff --git a/puppet/overcloud_controller.pp b/puppet/overcloud_controller.pp
index c217c5e9..f2e8733d 100644
--- a/puppet/overcloud_controller.pp
+++ b/puppet/overcloud_controller.pp
@@ -195,6 +195,14 @@ if hiera('step') >= 2 {
include ::neutron::agents::dhcp
include ::neutron::agents::l3
+ file { '/etc/neutron/dnsmasq-neutron.conf':
+ content => hiera('neutron_dnsmasq_options'),
+ owner => 'neutron',
+ group => 'neutron',
+ notify => Service['neutron-dhcp-service'],
+ require => Package['neutron'],
+ }
+
class { 'neutron::plugins::ml2':
flat_networks => split(hiera('neutron_flat_networks'), ','),
tenant_network_types => [hiera('neutron_tenant_network_type')],