diff options
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 1 | ||||
| -rw-r--r-- | devstack/tools/ironic/templates/vm.xml | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index a85401116..dcf938408 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -1590,6 +1590,7 @@ function configure_ironic_conductor { # specific driver interfaces in DevStack iniset $IRONIC_CONF_FILE DEFAULT enabled_power_interfaces "snmp" iniset $IRONIC_CONF_FILE DEFAULT enabled_management_interfaces "noop" + iniset $IRONIC_CONF_FILE pxe enable_netboot_fallback True fi if is_ansible_deploy_enabled; then diff --git a/devstack/tools/ironic/templates/vm.xml b/devstack/tools/ironic/templates/vm.xml index ff40f8fa0..f5c59b54e 100644 --- a/devstack/tools/ironic/templates/vm.xml +++ b/devstack/tools/ironic/templates/vm.xml @@ -34,15 +34,8 @@ <disk type='file' device='disk'> <driver name='qemu' type='{{ disk_format }}' cache='unsafe'/> <source file='{{ imagefile }}'/> - <!-- NOTE(lucasagomes): The virtio disk controller apparently does - not work with UEFI, so let's use IDE. --> - {% if uefi_loader %} - <target dev='vd{{ letter }}' bus='ide'/> - <address type='drive' controller='0' bus='0' target='0' unit='{{ loop.index }}'/> - {% else %} <target dev='vd{{ letter }}' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x0{{ letter }}' function='0x0'/> - {% endif %} </disk> {% endfor %} <controller type='ide' index='0'> |