diff options
| author | Zuul <zuul@review.opendev.org> | 2022-06-22 14:22:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-06-22 14:22:17 +0000 |
| commit | 1b6114934c122df115b8c945ca1ce8c3b7bd9bfd (patch) | |
| tree | b7e5368d9f7ce8c63665872fd19476ca9af2776a /devstack | |
| parent | 6f90d5f6a714761dd4828eb83157d13979f74022 (diff) | |
| parent | 832dc8bf948b57b3d404a58e3feb91278c02b59b (diff) | |
| download | ironic-1b6114934c122df115b8c945ca1ce8c3b7bd9bfd.tar.gz | |
Merge "Switch to q35 machine type for test nodes"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/tools/ironic/templates/vm.xml | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/devstack/tools/ironic/templates/vm.xml b/devstack/tools/ironic/templates/vm.xml index 2a3162afd..2e3ed6109 100644 --- a/devstack/tools/ironic/templates/vm.xml +++ b/devstack/tools/ironic/templates/vm.xml @@ -3,7 +3,7 @@ <memory unit='KiB'>{{ memory }}</memory> <vcpu>{{ cpus }}</vcpu> <os> - <type arch='{{ arch }}' machine='pc'>hvm</type> + <type arch='{{ arch }}' machine='q35'>hvm</type> {% if bootdev == 'network' and not uefi_loader %} <boot dev='{{ bootdev }}'/> {% endif %} @@ -36,13 +36,9 @@ <disk type='file' device='disk'> <driver name='qemu' type='{{ disk_format }}' cache='unsafe'/> <source file='{{ imagefile }}'/> - <target dev='vd{{ letter }}' bus='virtio'/> - <address type='pci' domain='0x0000' bus='0x00' slot='0x0{{ letter }}' function='0x0'/> + <target dev='vd{{ letter }}'/> </disk> {% endfor %} - <controller type='ide' index='0'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/> - </controller> {% for n in range(1, interface_count+1) %} <interface type='direct'> {% if n == 1 and mac %} @@ -50,16 +46,11 @@ {% endif %} <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'/> {{ console }} - <memballoon model='virtio'> - <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> - </memballoon> </devices> </domain> |