diff options
| author | Julia Kreger <juliaashleykreger@gmail.com> | 2018-10-29 10:22:22 -0700 |
|---|---|---|
| committer | Julia Kreger <juliaashleykreger@gmail.com> | 2019-06-05 14:21:13 -0700 |
| commit | 55e8d3fde1132af32b413b1b38d3e16288ec4398 (patch) | |
| tree | ad3cabe75e2d528a495340108301f38adbcf15a5 /devstack/tools/ironic | |
| parent | 73845b3655101efb2511e8bc61c5e7f9f866c8b2 (diff) | |
| download | ironic-55e8d3fde1132af32b413b1b38d3e16288ec4398.tar.gz | |
Add a pxe/uefi/grub2 CI job
Fixes the grub2 based devstack logic and adds a grub2 CI job
such that the ironic team can safely clean-up some of the PXE
code without fear of breaking the grub2 scenario.
Story: 2003936
Task: 27724
Change-Id: Ieb395bf35e2689741a243c11b56d08a237b200bc
Diffstat (limited to 'devstack/tools/ironic')
| -rw-r--r-- | devstack/tools/ironic/templates/vm.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/devstack/tools/ironic/templates/vm.xml b/devstack/tools/ironic/templates/vm.xml index f88d705b2..8a009f476 100644 --- a/devstack/tools/ironic/templates/vm.xml +++ b/devstack/tools/ironic/templates/vm.xml @@ -4,7 +4,9 @@ <vcpu>{{ cpus }}</vcpu> <os> <type arch='{{ arch }}' machine='pc-1.0'>hvm</type> + {% if bootdev == 'network' and not uefi_loader %} <boot dev='{{ bootdev }}'/> + {% endif %} {% if uefi_loader %} <loader readonly='yes' type='pflash'>{{ uefi_loader }}</loader> {% if uefi_nvram %} @@ -52,6 +54,9 @@ <source dev='{{ "tap-" + name + "i" + n|string }}'/> <model type='{{ nicdriver }}'/> <address type='pci' domain='0x0000' bus='0x01' slot='{{ "0x0" + n|string }}' function='0x0'/> + {% if uefi_loader and bootdev == 'network' %} + <boot order='{{ n|string }}'/> + {% endif %} </interface> {% endfor %} <input type='mouse' bus='ps2'/> |