diff options
| -rw-r--r-- | puppet/hieradata/controller.yaml | 1 | ||||
| -rw-r--r-- | puppet/overcloud_controller.pp | 8 |
2 files changed, 9 insertions, 0 deletions
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')], |