openstack/ironic
Code Issues Proposed changes

Switch to q35 machine type for test nodes

Browse Source 
q35 is recommended as emulating modern baremetal with better support
for UEFI in general, and Secure Boot in particular.

Old pc type usage is removed, like IDE controller, PS2 mouse, manual
PSI addresses.

Change-Id: Ic33e0f23c5c514a45541534ddd68329d7b4d0480
This commit is contained in:
Steve Baker 2022-05-27 15:02:35 +12:00
parent bcd81c0b28
commit 832dc8bf94
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
devstack/tools/ironic/templates/vm.xml
View File

@ -3,7 +3,7 @@
<memory unit='KiB'>{{ memory }}</memory> <memory unit='KiB'>{{ memory }}</memory>
<vcpu>{{ cpus }}</vcpu> <vcpu>{{ cpus }}</vcpu>
<os> <os>
<type arch='{{ arch }}' machine='pc'>hvm</type> <type arch='{{ arch }}' machine='q35'>hvm</type>
{% if bootdev == 'network' and not uefi_loader %} {% if bootdev == 'network' and not uefi_loader %}
<boot dev='{{ bootdev }}'/> <boot dev='{{ bootdev }}'/>
{% endif %} {% endif %}
@ -34,13 +34,9 @@
<disk type='file' device='disk'> <disk type='file' device='disk'>
<driver name='qemu' type='{{ disk_format }}' cache='unsafe'/> <driver name='qemu' type='{{ disk_format }}' cache='unsafe'/>
<source file='{{ imagefile }}'/> <source file='{{ imagefile }}'/>
<target dev='vd{{ letter }}' bus='virtio'/> <target dev='vd{{ letter }}'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x0{{ letter }}' function='0x0'/>
</disk> </disk>
{% endfor %} {% 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) %} {% for n in range(1, interface_count+1) %}
<interface type='direct'> <interface type='direct'>
{% if n == 1 and mac %} {% if n == 1 and mac %}
@ -48,16 +44,11 @@
{% endif %} {% endif %}
<source dev='{{ "tap-" + name + "i" + n|string }}'/> <source dev='{{ "tap-" + name + "i" + n|string }}'/>
<model type='{{ nicdriver }}'/> <model type='{{ nicdriver }}'/>
<address type='pci' domain='0x0000' bus='0x01' slot='{{ "0x0" + n|string }}' function='0x0'/>
{% if uefi_loader and bootdev == 'network' %} {% if uefi_loader and bootdev == 'network' %}
<boot order='{{ n|string }}'/> <boot order='{{ n|string }}'/>
{% endif %} {% endif %}
</interface> </interface>
{% endfor %} {% endfor %}
<input type='mouse' bus='ps2'/>
{{ console }} {{ console }}
<memballoon model='virtio'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
</memballoon>
</devices> </devices>
</domain> </domain>