openstack/bifrost
Code Issues Proposed changes

Merge "Allow to config dhcp lease time"

Browse Source
This commit is contained in:
Jenkins 2015-11-30 15:15:39 +00:00 committed by Gerrit Code Review
commit aa1ffdd2a6
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,10 @@ If you chose to utilize the dhcp server, You may wish to set default ranges:
dhcp_pool_start: 192.168.1.200
dhcp_pool_end: 192.168.1.250
And also set the default dhcp address lease time:
dhcp_lease_time: 12h
Alternatively, a user can choose to perform static DHCP assignments to nodes.
This can be enabled by setting the ``inventory_dhcp`` setting to ``true``.
This will result in the ``dhcp_pool_start`` and ``dhcp_pool_end`` settings

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

@ -55,6 +55,7 @@ enabled_drivers: "agent_ipmitool,pxe_amt,agent_ilo,agent_ucs"
# since IP allocation will be static.
dhcp_pool_start: 192.168.1.200
dhcp_pool_end: 192.168.1.250
dhcp_lease_time: 12h
# Dnsmasq default route for clients. If not defined, dnsmasq will push to clients
# as default route the same IP of the dnsmasq server.
# Default: undefined

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

@ -158,7 +158,7 @@ dhcp-hostsfile=/etc/dnsmasq.d/bifrost.dhcp-hosts.d
{% if testing %}
dhcp-range=192.168.122.2,192.168.122.254,12h
{% else %}
dhcp-range={{dhcp_pool_start}},{{dhcp_pool_end}},12h
dhcp-range={{dhcp_pool_start}},{{dhcp_pool_end}},{{dhcp_lease_time}}
{% endif %}
{% endif %}