From a5be320a86dfe2ea92d42ca4b93dba81b6bf1d35 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Sun, 1 Feb 2015 13:40:23 -0500 Subject: 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 --- puppet/hieradata/controller.yaml | 1 + puppet/overcloud_controller.pp | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index e59211d4..39d2a487 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -56,6 +56,7 @@ neutron::dhcp_agents_per_network: 2 neutron::plugins::ml2::tunnel_id_ranges: - '1:1000' neutron::server::sync_db: true +neutron::agents::dhcp::dnsmasq_config_file: /etc/neutron/dnsmasq-neutron.conf # nova nova::notify_on_state_change: 'vm_and_task_state' 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')], -- cgit 1.2.3-korg