openstack/fuel-library
Code Issues Proposed changes

Use tags in the dnsmasq for HTTP boot

Browse Source 
Use tags in the dnsmasq instead old 'net' method to support
multirack feature.

Change-Id: I05327aad3f2a72b748707ccb2942b70400ae55b4
Related-Bug: #1528186
This commit is contained in:
Maksim Malchuk 2015-12-22 12:03:45 +03:00
parent 10ed2f60c6
commit 39bc263006
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deployment/puppet/nailgun/spec/hosts/default_spec.rb
View File

@ -48,6 +48,12 @@ describe 'default' do
it { should contain_file("/etc/dnsmasq.d/#{resource_name}.conf") \ it { should contain_file("/etc/dnsmasq.d/#{resource_name}.conf") \
.with_content(/^dhcp-range=#{resource_name}.*#{netmask},120m\n|,boothost,#{admin_network['ipaddress']}\n/) .with_content(/^dhcp-range=#{resource_name}.*#{netmask},120m\n|,boothost,#{admin_network['ipaddress']}\n/)
} }
it { should contain_file("/etc/dnsmasq.d/#{resource_name}.conf") \
.with_content(/^dhcp-match=set:ipxe,175$/)
}
it { should contain_file("/etc/dnsmasq.d/#{resource_name}.conf") \
.with_content(/^dhcp-option-force=tag:ipxe,210,http:/)
}
end end
end end

4
deployment/puppet/nailgun/templates/dnsmasq.dhcp-range.erb
View File

@ -2,5 +2,5 @@
dhcp-range=<%= @range_name %>,<%= @dhcp_start_address %>,<%= @dhcp_end_address %>,<%= @dhcp_netmask %>,<%= @lease_time %> dhcp-range=<%= @range_name %>,<%= @dhcp_start_address %>,<%= @dhcp_end_address %>,<%= @dhcp_netmask %>,<%= @lease_time %>
dhcp-option=net:<%= @range_name %>,option:router,<%= @dhcp_gateway %> dhcp-option=net:<%= @range_name %>,option:router,<%= @dhcp_gateway %>
dhcp-boot=net:<%= @range_name %>,pxelinux.0,boothost,<%= @next_server %> dhcp-boot=net:<%= @range_name %>,pxelinux.0,boothost,<%= @next_server %>
dhcp-match=ipxe,175 dhcp-match=set:ipxe,175
dhcp-option-force=net:ipxe,210,http://<%= @next_server %>/cobbler/boot/ dhcp-option-force=tag:ipxe,210,http://<%= @next_server %>/cobbler/boot/