openstack
/
bifrost
Code Issues Proposed changes

Merge "Add dns_servers feature to bifrost dnsmasq"

This commit is contained in:
Jenkins 2016-01-30 03:32:19 +00:00 committed by Gerrit Code Review
parent 9a7e3ca209 b4df04f4a3
commit 2e19f19fc7
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
playbooks/inventory/group_vars/localhost
View File

@ -65,3 +65,8 @@ create_ipa_image: false
# clients as default route the same IP of the dnsmasq server.
# Default: undefined
# dnsmasq_router: {{ ipv4_gateway }}
# Dnsmasq default nameserver for clients. If not defined, this setting
# will be ignored.
# Default: undefined
# dnsmasq_dns_servers: 8.8.8.8,8.8.4.4

4
playbooks/roles/bifrost-ironic-install/defaults/main.yml
View File

@ -72,6 +72,10 @@ dhcp_static_mask: 255.255.255.0
# Default: undefined
# dnsmasq_router:
# Dnsmasq default dns servers for clients. If defined, dnsmasq will use the specified
# DNS servers for name resolving.
# dnsmasq_dns_servers: 8.8.8.8,8.8.4.4
# Support for CORS configuration
# By default CORS support is disabled.
enable_cors: false

4
playbooks/roles/bifrost-ironic-install/templates/dnsmasq.conf.j2
View File

@ -78,6 +78,10 @@ dhcp-range={{dhcp_pool_start}},{{dhcp_pool_end}},{{dhcp_lease_time}}
dhcp-option=3,{{dnsmasq_router}}
{% endif %}
{% if dnsmasq_dns_servers is defined %}
dhcp-option=6,{{dnsmasq_dns_servers}}
{% endif %}
# Boot for Etherboot gPXE. The idea is to send two different
# filenames, the first loads gPXE, and the second tells gPXE what to
# load. The dhcp-match sets the gpxe tag for requests from gPXE.

11
releasenotes/notes/populate_dns_servers_dnsmasq-4f30a9957e8de732.yaml Normal file
View File

@ -0,0 +1,11 @@
---
features:
- Allow to populate the DNS servers setting of
dnsmasq. This is optional, but if
``dnsmasq_dns_servers``setting is set, it adds a
``dhcp-option=6,dnsmasq_dns_servers`` to the
generated dnsmasq configuration for bifrost.
other:
- When configuring the ``dnsmasq_dns_servers`` setting,
several nameservers can be specified, separated by
commas.