openstack/kolla-ansible
Code Issues Proposed changes

Merge "Make DNS resolvers configurable."

Browse Source
This commit is contained in:
Zuul 2018-04-30 14:11:37 +00:00 committed by Gerrit Code Review
commit 82c8afd425
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"
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
#######################

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

@ -3,7 +3,7 @@
dnsmasq_config_file = /etc/neutron/dnsmasq.conf
enable_isolated_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' %}
ovs_integration_bridge = {{ neutron_bridge_name }}