diff options
| author | Dmitry Tantsur <dtantsur@protonmail.com> | 2022-05-18 09:43:39 +0200 |
|---|---|---|
| committer | Riccardo Pittau <elfosardo@gmail.com> | 2022-10-13 09:42:22 +0000 |
| commit | 7f99655343404d890d8243df016bfb2503d7c1bf (patch) | |
| tree | 7bba354b7c31581939913258bd2606ee5e25cbb5 | |
| parent | b44ccf169baa18aedbbd6d59ac86d9afdff099b2 (diff) | |
| download | ironic-7f99655343404d890d8243df016bfb2503d7c1bf.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
(cherry picked from commit 81f583f69b76d608bd99be0d59cc808b64effc4a)
| -rw-r--r-- | devstack/lib/ironic | 8 | ||||
| -rw-r--r-- | devstack/tools/ironic/templates/vm.xml | 4 | ||||
| -rw-r--r-- | doc/source/install/deploy-ramdisk.rst | 3 | ||||
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 2 |
4 files changed, 12 insertions, 5 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 1a4bd1836..07c804f9a 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -317,7 +317,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 @@ -344,11 +344,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/> diff --git a/doc/source/install/deploy-ramdisk.rst b/doc/source/install/deploy-ramdisk.rst index 3979f705f..8c89c4dd0 100644 --- a/doc/source/install/deploy-ramdisk.rst +++ b/doc/source/install/deploy-ramdisk.rst @@ -14,7 +14,8 @@ Two kinds of images are published on every commit from every branch of https://tarballs.openstack.org/ironic-python-agent/dib/files/. * For Train and older use CentOS 7 images. - * For Ussuri and newer use CentOS 8 images. + * For Ussuri and up to Yoga use CentOS 8 images. + * For Zed and newer use CentOS 9 images. .. warning:: CentOS 7 master images are no longer updated and must not be used. diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index e8a6f543d..0cdbc0e24 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -716,7 +716,7 @@ s-object: True s-proxy: True devstack_localrc: - IRONIC_DIB_RAMDISK_OS: centos8 + IRONIC_DIB_RAMDISK_OS: centos9 IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True IRONIC_VM_EPHEMERAL_DISK: 0 IRONIC_VM_INTERFACE_COUNT: 1 |