openstack
/
cookbook-openstack-network
Code Issues Proposed changes

Allow overriding replies for specific domain names via dnsmasq.conf 

backport: queens

Change-Id: I44d1d01b943167049e2f09fb251e1a54b6c43d47
changes/80/650280/2
Roger Luethi 2019-04-05 13:47:23 +02:00
parent 66490ada34
commit 5bb0cf6aaa
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
attributes/default.rb
View File

@ -97,6 +97,11 @@ end
# May be a comma separated list of servers
default['openstack']['network']['dnsmasq']['upstream_dns_servers'] = %w(8.8.8.8 208.67.222.222)
# List of domains and corresponding IP addresses to override upstream DNS
# servers. The format expected by dnsmasq is /<domain>/<address>,
# e.g. "/double-click.net/127.0.0.1" or "/localhost/::1".
default['openstack']['network']['dnsmasq']['override_dns_address'] = %w()
# ============================= DHCP Agent Configuration ===================
default['openstack']['network_dhcp']['config_file'] = '/etc/neutron/dhcp_agent.ini'
default['openstack']['network_dhcp']['conf'].tap do |conf|

3
templates/default/dnsmasq.conf.erb
View File

@ -1,3 +1,6 @@
<% node['openstack']['network']['dnsmasq']['upstream_dns_servers'].each do |dns_server| -%>
server=<%= dns_server %>
<% end -%>
<% node['openstack']['network']['dnsmasq']['override_dns_address'].each do |address_record| -%>
address=<%= address_record %>
<% end -%>