diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-05-18 09:43:39 +0200 |
|---|---|---|
| committer | Julia Kreger <juliaashleykreger@gmail.com> | 2022-05-25 08:57:15 -0700 |
| commit | 81f583f69b76d608bd99be0d59cc808b64effc4a (patch) | |
| tree | 25fab6e2f2ad8950e4c73129b1513c6308dafdf0 /devstack | |
| parent | bcd81c0b2837cf8968060dd6f2c6fc6d051e340d (diff) | |
| download | ironic-81f583f69b76d608bd99be0d59cc808b64effc4a.tar.gz | |
devstack: use CentOS 9 for DIB IPA builds
Additionally bumps CPU model to host-model as centos9 builds now
require a subset of CPU processors which include advanced features.
Host-model also allows for the VM to still start when running with
pure qemu, as opposed to KVM passthrough.
https://developers.redhat.com/blog/2021/01/05/building-red-hat-enterprise-linux-9-for-the-x86-64-v2-microarchitecture-level#architectural_considerations_for_rhel_9
Change-Id: Ic261efd4bf6f5929687df5e7b1b51b541554af18
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 8 | ||||
| -rw-r--r-- | devstack/tools/ironic/templates/vm.xml | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 7e5e01fc6..03fb806a2 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -314,7 +314,7 @@ IPA_DOWNLOAD_BRANCH=${IPA_DOWNLOAD_BRANCH:-master} IPA_DOWNLOAD_BRANCH=$(echo $IPA_DOWNLOAD_BRANCH | tr / -) # OS for using with DIB images -IRONIC_DIB_RAMDISK_OS=${IRONIC_DIB_RAMDISK_OS:-centos8} +IRONIC_DIB_RAMDISK_OS=${IRONIC_DIB_RAMDISK_OS:-centos9} IRONIC_DIB_RAMDISK_RELEASE=${IRONIC_DIB_RAMDISK_RELEASE:-} # Configure URLs required to download ramdisk if we're not building it, and @@ -341,11 +341,15 @@ fi # to build the dib based ironic-python-agent ramdisk. IRONIC_DIB_RAMDISK_OPTIONS=${IRONIC_DIB_RAMDISK_OPTIONS:-} if [[ -z "$IRONIC_DIB_RAMDISK_OPTIONS" ]]; then + # Adapt for DIB naming change if [[ "$IRONIC_DIB_RAMDISK_OS" == "centos8" ]]; then - # Adapt for DIB naming change IRONIC_DIB_RAMDISK_OS=centos IRONIC_DIB_RAMDISK_RELEASE=8-stream fi + if [[ "$IRONIC_DIB_RAMDISK_OS" == "centos9" ]]; then + IRONIC_DIB_RAMDISK_OS=centos + IRONIC_DIB_RAMDISK_RELEASE=9-stream + fi IRONIC_DIB_RAMDISK_OPTIONS="$IRONIC_DIB_RAMDISK_OS" fi # DHCP timeout for the dhcp-all-interfaces element. diff --git a/devstack/tools/ironic/templates/vm.xml b/devstack/tools/ironic/templates/vm.xml index f5c59b54e..2a3162afd 100644 --- a/devstack/tools/ironic/templates/vm.xml +++ b/devstack/tools/ironic/templates/vm.xml @@ -17,7 +17,9 @@ <bios useserial='yes'/> </os> {% if engine == 'kvm' %} - <cpu mode='host-passthrough'/> + <cpu mode='host-passthrough'/> + {% else %} + <cpu mode='host-model'/> {% endif %} <features> <acpi/> |