Merge branch 'master' of https://github.com/juliakreger/ironic-poc into bifrost

This commit is contained in:
Julia Kreger 2015-03-09 13:50:25 -04:00
commit 642a5cb3fe

View File

@ -423,7 +423,7 @@ dhcp-range={{dhcp_pool_start}},{{dhcp_pool_end}},12h
# load. The dhcp-match sets the gpxe tag for requests from gPXE.
dhcp-match=set:ipxe,175 # iPXE sends a 175 option.
dhcp-boot=tag:!ipxe,undionly.kpxe
dhcp-boot=http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}/boot.ipxe
dhcp-boot=http://{{ hostvars[inventory_hostname]['ansible_' + network_interface]['ipv4']['address'] }}:8080/boot.ipxe
# Encapsulated options for Etherboot gPXE. All the options are
# encapsulated within option 175