Merge "Do not offer DHCP leases to unknown machines when using inventory_dhcp"

This commit is contained in:
Jenkins 2016-02-24 07:35:58 +00:00 committed by Gerrit Code Review
commit b0ecf86d5d
2 changed files with 5 additions and 0 deletions

View File

@ -45,6 +45,7 @@ conf-dir=/etc/dnsmasq.d
{% if inventory_dhcp %} {% if inventory_dhcp %}
addn-hosts=/etc/dnsmasq.d/bifrost.hosts.d addn-hosts=/etc/dnsmasq.d/bifrost.hosts.d
dhcp-hostsfile=/etc/dnsmasq.d/bifrost.dhcp-hosts.d dhcp-hostsfile=/etc/dnsmasq.d/bifrost.dhcp-hosts.d
dhcp-ignore=tag:!known
{% endif %} {% endif %}
# Set the domain for dnsmasq. this is optional, but if it is set, it # Set the domain for dnsmasq. this is optional, but if it is set, it

View File

@ -0,0 +1,4 @@
---
fixes:
- Dnsmasq option was added to only offer DHCP leases
to known mac addresses when inventory_dhcp is being used.