openstack/kolla-ansible
Code Issues Proposed changes

Make DNS resolvers configurable.

Browse Source 
Change the default hardcoded values of the dnsmasq dns resolvers
on dhcp_agent.ini.j2 to a configuration option part
of group_vars/all.yml.

Also adding 1.1.1.1 as part of the default set.

Change-Id: I629c69e556d4ddba19f68f06627038e1886ae5f9
Signed-off-by: Jorge Niedbalski <jorge.niedbalski@linaro.org>
This commit is contained in:
Jorge Niedbalski 2018-04-30 09:08:14 -03:00
parent de1777134e
commit 3f4bc1c50e
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ansible/group_vars/all.yml
View File

@ -657,6 +657,9 @@ neutron_tenant_network_types: "vxlan"
neutron_compute_dvr_mode: "dvr" neutron_compute_dvr_mode: "dvr"
computes_need_external_bridge: "{{ enable_neutron_dvr | bool and (neutron_compute_dvr_mode == 'dvr' or inventory_hostname in groups['external-compute']) or enable_neutron_provider_networks | bool or enable_opendaylight | bool and neutron_plugin_agent != 'vmware_dvs' }}" computes_need_external_bridge: "{{ enable_neutron_dvr | bool and (neutron_compute_dvr_mode == 'dvr' or inventory_hostname in groups['external-compute']) or enable_neutron_provider_networks | bool or enable_opendaylight | bool and neutron_plugin_agent != 'vmware_dvs' }}"
# Default DNS resolvers for virtual networks
neutron_dnsmasq_dns_servers: "1.1.1.1,8.8.8.8,8.8.4.4"
####################### #######################
# Nova options # Nova options
####################### #######################

2
ansible/roles/neutron/templates/dhcp_agent.ini.j2
View File

@ -3,7 +3,7 @@
dnsmasq_config_file = /etc/neutron/dnsmasq.conf dnsmasq_config_file = /etc/neutron/dnsmasq.conf
enable_isolated_metadata = true enable_isolated_metadata = true
force_metadata = true force_metadata = true
dnsmasq_dns_servers = 8.8.8.8,8.8.4.4 dnsmasq_dns_servers = {{ neutron_dnsmasq_dns_servers }}
{% if neutron_plugin_agent == 'vmware_dvs' %} {% if neutron_plugin_agent == 'vmware_dvs' %}
ovs_integration_bridge = {{ neutron_bridge_name }} ovs_integration_bridge = {{ neutron_bridge_name }}