openstack
/
bifrost
Code Issues Proposed changes

Merge "Allow to populate the domain setting of dnsmasq"

This commit is contained in:
Jenkins 2016-01-15 14:57:29 +00:00 committed by Gerrit Code Review
parent 2a370dd08a 2d713268a3
commit 1780f41d23
3 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
playbooks/roles/bifrost-ironic-install/README.md
View File

@ -143,6 +143,9 @@ enable_cors_credential_support: Boolean value, default false. This variable
noauth mode, this realistically should not
be modified.
domain: String value, default to false. If set, domain setting is configured
in dnsmasq.
### Hardware Inspection Support
Bifrost also supports the installation of ironic-inspector in standalone

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

@ -142,6 +142,9 @@ dhcp-hostsfile=/etc/dnsmasq.d/bifrost.dhcp-hosts.d
# domain of all systems configured by DHCP
# 3) Provides the domain part for "expand-hosts"
#domain=thekelleys.org.uk
{% if domain is defined %}
domain={{ domain }}
{% endif %}
# Set a different domain for a particular subnet
#domain=wireless.thekelleys.org.uk,192.168.2.0/24

14
releasenotes/notes/populate_domain_dnsmasq-5408896247eb39b4.yaml Normal file
View File

@ -0,0 +1,14 @@
---
features:
- Allow to populate the domain setting of
dnsmasq. As shown in documentation: this is optional,
but if it is set, it does the following things.
1) Allows DHCP hosts to have fully qualified domain
names, as long as the domain part matches this setting.
2) Sets the "domain" DHCP option thereby potentially
setting the domain of all systems configured by DHCP.
3) Provides the domain part for "expand-hosts"
other:
- The role will accept the ``domain`` setting. If that's
present, it will be populated to equivalent domain
setting in dnsmasq.conf