openstack
/
openstack-ansible-os_neutron
Code Issues Proposed changes

Move the neutron_dhcp_config back to defaults 

The neutron_dhcp_config option was being set in vars which makes it
immutable. This option is set within our playbooks and needs to be
available to for override. To allow the neutron_dhcp_config option to be
overriden or extended it has been moved back to defaults.

Change-Id: I30d4f676ffbbac5f1541c7e8fe188c10d8c6148e
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2017-10-27 14:19:59 -05:00
parent e2b171d7ad
commit 1267856f13
No known key found for this signature in database
GPG Key ID: 69FEFFC5E2D9273F
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
defaults/main.yml
View File

@ -308,6 +308,10 @@ neutron_l3_ha_net_cidr: 169.254.192.0/18
### DHCP Agent Plugin Configuration
###
# key=value options provided to dnsmasq
neutron_dhcp_config:
log-facility: "/var/log/neutron/neutron-dnsmasq.log"
# Comma-separated list of DNS servers which will be used by dnsmasq as forwarders.
neutron_dnsmasq_dns_servers: ""

2
vars/main.yml
View File

@ -233,8 +233,6 @@ neutron_l3: "{% if 'router' in neutron_plugin_base or 'neutron.services.l3_route
###
neutron_dhcp: "{% if neutron_plugin_type.split('.')[0] == 'ml2' %}True{% else %}False{% endif %}"
neutron_dhcp_config:
log-facility: "/var/log/neutron/neutron-dnsmasq.log"
###
### Metadata Agent Plugin Configuration