openstack/fuel-library
Code Issues Proposed changes

Merge "Remove pxe-service flag in Cobbler and GPXE exclusion"

Browse Source
This commit is contained in:
Jenkins 2015-04-29 17:05:45 +00:00 committed by Gerrit Code Review
commit d7a0f2ed2b
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deployment/puppet/cobbler/templates/dnsmasq.template.erb
View File

@ -13,7 +13,6 @@ server=/<%= @domain_name %>/
<% end %>
server=/<%= @dns_domain %>/
resolv-file=/etc/dnsmasq.upstream
dhcp-match=gpxe,175
interface=<%= @dhcp_interface %>
cache-size=1024
@ -34,7 +33,6 @@ dhcp-option=6,<%= @name_server %>
dhcp-range=internal,<%= @dhcp_start_address %>,<%= @dhcp_end_address %>,<%= @dhcp_netmask %>,<%= @lease_time %>
dhcp-option=net:internal,option:router,<%= @dhcp_gateway %>
pxe-service=net:#gpxe,x86PC,"Install",pxelinux,<%= @next_server %>
dhcp-boot=net:internal,pxelinux.0,boothost,<%= @next_server %>
$insert_cobbler_system_definitions