Allow overriding replies for specific domain names via dnsmasq.conf
backport: queens
Change-Id: I44d1d01b943167049e2f09fb251e1a54b6c43d47
(cherry picked from commit 5bb0cf6aaa
)
This commit is contained in:
parent
6bfb0e02bc
commit
97d261f72e
|
@ -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|
|
||||
|
|
|
@ -4,7 +4,7 @@ maintainer_email 'openstack-dev@lists.openstack.org'
|
|||
license 'Apache-2.0'
|
||||
description 'Installs and configures the OpenStack Network API Service and various agents and plugins'
|
||||
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
|
||||
version '17.1.0'
|
||||
version '17.2.0'
|
||||
|
||||
%w(ubuntu redhat centos).each do |os|
|
||||
supports os
|
||||
|
|
|
@ -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 -%>
|
||||
|
|
Loading…
Reference in New Issue