openstack
/
puppet-ironic
Code Issues Proposed changes

Increase Ironic inspector dnsmasq lease time 

As described in bug, its possible that addresses provided to IPA via
DHCP may expire and not be added to the introspection report.  This
increases the dhcp lease time from 2 to 10 minutes.  There should be
no downside to increasing this lease time since these addresses
are only used during introspection.

Change-Id: Iae15e9db0acc2ecd5b087a9ca430be948bc3e649
Closes-Bug: 1721051
This commit is contained in:
Bob Fournier 2017-10-04 09:42:23 -04:00
parent 3aaf2d06f0
commit c00a1b88ba
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
releasenotes/notes/increase-inspector-dnsmasq-lease-7e5b03941f3e161c.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- Increase the Inspector DHCP lease time that is provide by dnsmasq to 10
minutes. A shorter lease time may cause the provided IP address to expire
and IPA may not add the address to the introspection report.

8
spec/classes/ironic_inspector_spec.rb
View File

@ -141,16 +141,16 @@ describe 'ironic::inspector' do
'content' => /pxelinux/,
)
is_expected.to contain_file('/etc/ironic-inspector/dnsmasq.conf').with_content(
/dhcp-range=192.168.0.100,192.168.0.120,2m/
/dhcp-range=192.168.0.100,192.168.0.120,10m/
)
is_expected.to contain_file('/etc/ironic-inspector/dnsmasq.conf').with_content(
/dhcp-range=set:subnet1,192.168.1.100,192.168.1.200,255.255.255.0,2m/
/dhcp-range=set:subnet1,192.168.1.100,192.168.1.200,255.255.255.0,10m/
)
is_expected.to contain_file('/etc/ironic-inspector/dnsmasq.conf').with_content(
/dhcp-option=tag:subnet1,option:router,192.168.1.254/
)
is_expected.to contain_file('/etc/ironic-inspector/dnsmasq.conf').with_content(
/dhcp-range=set:subnet2,192.168.2.100,192.168.2.200,255.255.255.0,2m/
/dhcp-range=set:subnet2,192.168.2.100,192.168.2.200,255.255.255.0,10m/
)
is_expected.to contain_file('/etc/ironic-inspector/dnsmasq.conf').with_content(
/dhcp-option=tag:subnet2,option:router,192.168.2.254/
@ -225,7 +225,7 @@ describe 'ironic::inspector' do
/dhcp-boot=tag:ipxe,http:\/\/192.168.0.1:3816\/inspector.ipxe/
)
is_expected.to contain_file('/etc/ironic-inspector/dnsmasq.conf').with_content(
/dhcp-range=192.168.0.100,192.168.0.120,2m/
/dhcp-range=192.168.0.100,192.168.0.120,10m/
)
end
it 'should contain file /var/www/httpboot/inspector.ipxe' do

6
templates/inspector_dnsmasq_http.erb
View File

@ -3,11 +3,11 @@ interface=<%= @dnsmasq_interface %>
bind-interfaces
<% @dnsmasq_ip_subnets_real.each do |s| -%>
<% if s['tag'] and s['netmask'] -%>
dhcp-range=set:<%= s['tag'] -%>,<%= s['ip_range'] -%>,<%= s['netmask'] -%>,2m
dhcp-range=set:<%= s['tag'] -%>,<%= s['ip_range'] -%>,<%= s['netmask'] -%>,10m
<% elsif s['tag'] -%>
dhcp-range=set:<%= s['tag'] -%>,<%= s['ip_range'] -%>,2m
dhcp-range=set:<%= s['tag'] -%>,<%= s['ip_range'] -%>,10m
<% else -%>
dhcp-range=<%= s['ip_range'] -%>,2m
dhcp-range=<%= s['ip_range'] -%>,10m
<% end -%>
<% if s['gateway'] -%>
<% if s['tag'] -%>

6
templates/inspector_dnsmasq_tftp.erb
View File

@ -3,11 +3,11 @@ interface=<%= @dnsmasq_interface %>
bind-interfaces
<% @dnsmasq_ip_subnets_real.each do |s| -%>
<% if s['tag'] and s['netmask'] -%>
dhcp-range=set:<%= s['tag'] -%>,<%= s['ip_range'] -%>,<%= s['netmask'] -%>,2m
dhcp-range=set:<%= s['tag'] -%>,<%= s['ip_range'] -%>,<%= s['netmask'] -%>,10m
<% elsif s['tag'] -%>
dhcp-range=set:<%= s['tag'] -%>,<%= s['ip_range'] -%>,2m
dhcp-range=set:<%= s['tag'] -%>,<%= s['ip_range'] -%>,10m
<% else -%>
dhcp-range=<%= s['ip_range'] -%>,2m
dhcp-range=<%= s['ip_range'] -%>,10m
<% end -%>
<% if s['gateway'] -%>
<% if s['tag'] -%>