From 00ce3fb3bbf4caa7b4069b96d96ce87d491ccd50 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 11 Jan 2023 11:53:56 +0100 Subject: [PATCH 01/10] Update magnum_tag --- etc/kayobe/kolla/globals.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 72585ae84..f97ca49d8 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -5,11 +5,13 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" {% if kolla_base_distro == 'centos' %} bifrost_tag: wallaby-20220921T100954 +magnum_tag: wallaby-20230111T101726 rabbitmq_tag: wallaby-20221205T160115 {% else %} bifrost_tag: wallaby-20220825T112231 cloudkitty_tag: wallaby-20221215T220154 kolla_toolbox_tag: wallaby-20221222T161624 +magnum_tag: wallaby-20230111T103759 neutron_tag: wallaby-20221222T161624 neutron_tls_proxy_tag: "{% raw %}{{ openstack_tag }}{% endraw %}" nova_tag: wallaby-20221222T161624 From 471c8658c6a0a87692e73b1830def75858958e33 Mon Sep 17 00:00:00 2001 From: Matt Anson Date: Tue, 10 Jan 2023 15:46:49 +0000 Subject: [PATCH 02/10] Add releasenote (cherry picked from commit ee30588f999fb60bf77cc35c63f48d015242139a) --- .../notes/magnum-bump-tags-7841edcbd3da4b9c.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml diff --git a/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml b/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml new file mode 100644 index 000000000..28b922e76 --- /dev/null +++ b/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml @@ -0,0 +1,10 @@ +--- +fixes: + - | + Fixes CoreDNS for Magnum clusters crashing on startup. + - | + Allows cinder-csi nodeplugin to start on the same Magnum cluster host as + cinder-csi controllerplugin. + - | + Corrects ClusterRole rules for Magnum cluster-autoscaler, and sets + cluster-autoscaler pods to use hostNetwork. From 86c4cd5f267aeec1bd6a0e1b45279d993a0fa4b1 Mon Sep 17 00:00:00 2001 From: Matt Anson Date: Tue, 17 Jan 2023 10:13:16 +0000 Subject: [PATCH 03/10] Use Rocky 8.7 repositories --- etc/kayobe/pulp-repo-versions.yml | 15 ++++++++++----- etc/kayobe/pulp.yml | 4 ++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 4864866bd..2bdb64d70 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -21,8 +21,13 @@ stackhpc_pulp_repo_treasuredata_4_version: 20220823T042339 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20220804T040153 stackhpc_pulp_repo_ubuntu_focal_security_version: 20220804T040153 stackhpc_pulp_repo_ubuntu_focal_version: 20220804T040153 -stackhpc_pulp_repo_rocky_8_6_appstream_version: "20220606T111205" -stackhpc_pulp_repo_rocky_8_6_baseos_version: "20220606T111205" -stackhpc_pulp_repo_rocky_8_6_extras_version: "20220606T111205" -stackhpc_pulp_repo_rocky_8_6_nfv_version: "20220606T111205" -stackhpc_pulp_repo_rocky_8_6_powertools_version: "20220606T111205" +stackhpc_pulp_repo_rocky_8_6_appstream_version: 20220606T111205 +stackhpc_pulp_repo_rocky_8_6_baseos_version: 20220606T111205 +stackhpc_pulp_repo_rocky_8_6_extras_version: 20220606T111205 +stackhpc_pulp_repo_rocky_8_6_nfv_version: 20220606T111205 +stackhpc_pulp_repo_rocky_8_6_powertools_version: 20220606T111205 +stackhpc_pulp_repo_rocky_8_7_appstream_version: 20221201T192704 +stackhpc_pulp_repo_rocky_8_7_baseos_version: 20221202T032715 +stackhpc_pulp_repo_rocky_8_7_extras_version: 20221201T192704 +stackhpc_pulp_repo_rocky_8_7_nfv_version: 20221202T032715 +stackhpc_pulp_repo_rocky_8_7_powertools_version: 20221202T032715 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index d40f661b4..f2a3d39da 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -179,8 +179,8 @@ stackhpc_pulp_sync_centos_stream8: "{{ os_distribution == 'centos' }}" # Whether to sync Rocky Linux 8 packages. stackhpc_pulp_sync_rocky_8: "{{ os_distribution == 'rocky' }}" -# Rocky 8 minor version number. Supported values: 6. -stackhpc_pulp_repo_rocky_8_minor_version: 6 +# Rocky 8 minor version number. Supported values: 6, 7 +stackhpc_pulp_repo_rocky_8_minor_version: 7 # Rocky 8 Snapshot versions. The defaults use the appropriate version from # pulp-repo-versions.yml for the selected minor release. stackhpc_pulp_repo_rocky_8_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_8_%s_appstream_version' % stackhpc_pulp_repo_rocky_8_minor_version) }}" From 9dd9d93bef5d1a405b639ed69d8d6d538fc70dc7 Mon Sep 17 00:00:00 2001 From: Matt Anson Date: Tue, 17 Jan 2023 10:46:11 +0000 Subject: [PATCH 04/10] Add releasenote --- releasenotes/notes/rocky-87-rpms-999565263dacde42.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releasenotes/notes/rocky-87-rpms-999565263dacde42.yaml diff --git a/releasenotes/notes/rocky-87-rpms-999565263dacde42.yaml b/releasenotes/notes/rocky-87-rpms-999565263dacde42.yaml new file mode 100644 index 000000000..4f9db394b --- /dev/null +++ b/releasenotes/notes/rocky-87-rpms-999565263dacde42.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + Sync Rocky Linux 8.7 RPM repositories to local Pulp servers. From 72e2f72c4c0c34986f03799fa5b4dcab5f4c4a85 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 18 Jan 2023 11:51:51 +0100 Subject: [PATCH 05/10] Patch edk2-ovmf file to fix UEFI support The file 50-edk2-ovmf-cc.json is used by Nova in get_loader() when lauching UEFI instances without Secure Boot. It only supports machine type pc-q35-rhel8.5.0. However, with recent nova-compute container images built on CentOS Stream 8, the machine type is pc-q35-rhel8.6.0, which results in failures to launch instances with: nova.exception.UEFINotSupported: UEFI is not supported There is a fix for RHEL9/c9s [1], but not for RHEL8/c8s. Also see [2] for more details. [1] https://bugzilla.redhat.com/show_bug.cgi?id=2090752 [2] https://bugs.launchpad.net/nova/+bug/1955035 --- etc/kayobe/kolla.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 9743b4c41..bb649872b 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -275,6 +275,14 @@ kolla_build_blocks: ARG mysqld_exporter_version='0.13.0' prometheus_blackbox_exporter_repository_version: | ARG blackbox_exporter_version='0.19.0' + nova_base_footer: | + # Fix for https://bugs.launchpad.net/nova/+bug/1955035, i.e. + # https://bugzilla.redhat.com/show_bug.cgi?id=2090752 on c8s + {% raw %} + {% if base_package_type == 'rpm' %} + RUN sed -i 's/"pc-q35-rhel8.5.0"/"pc-q35-*"/' /usr/share/qemu/firmware/50-edk2-ovmf-cc.json + {% endif %} + {% endraw %} kolla_build_customizations_common: bifrost_base_pip_packages_append: From 4eaa4160afe3d24034f5b36074fd0d01de827594 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 19 Jan 2023 11:13:29 +0100 Subject: [PATCH 06/10] Deploy Nova images with edk2-ovmf UEFI fix See #339 for context. --- etc/kayobe/kolla/globals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index f97ca49d8..9ffa63154 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -6,6 +6,7 @@ docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" {% if kolla_base_distro == 'centos' %} bifrost_tag: wallaby-20220921T100954 magnum_tag: wallaby-20230111T101726 +nova_tag: wallaby-20230119T093225 rabbitmq_tag: wallaby-20221205T160115 {% else %} bifrost_tag: wallaby-20220825T112231 From 08920c541c7b054096432fce374b0f5e5490916a Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 19 Jan 2023 09:19:04 +0000 Subject: [PATCH 07/10] CI: Workaround container image builder power cycle issue While not pretty, this workaround avoids manual intervention after the runner is power cycled. Co-Authored-By: Pierre Riteau --- .github/workflows/stackhpc-container-image-build.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml index a36e3f12d..d6de1e81e 100644 --- a/.github/workflows/stackhpc-container-image-build.yml +++ b/.github/workflows/stackhpc-container-image-build.yml @@ -66,6 +66,14 @@ jobs: sudo ip l set dummy1 up sudo ip l set dummy1 master breth1 + # FIXME: Without this workaround we see the following issue after the runner is power cycled: + # TASK [MichaelRigart.interfaces : RedHat | ensure network service is started and enabled] *** + # Unable to start service network: Job for network.service failed because the control process exited with error code. + # See \"systemctl status network.service\" and \"journalctl -xe\" for details. + - name: Kill dhclient (workaround) + run: | + (sudo killall dhclient || true) && sudo systemctl restart network + - name: Install Kayobe run: | mkdir -p venvs && From 12bdfe583fef597988838ec73f541a4b85974e9f Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 19 Jan 2023 15:20:50 +0100 Subject: [PATCH 08/10] Fix small nits with existing release notes --- releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml | 2 +- .../notes/update-rabbitmq-version-90fe988f516e090a.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml b/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml index 28b922e76..4850e4995 100644 --- a/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml +++ b/releasenotes/notes/magnum-bump-tags-7841edcbd3da4b9c.yaml @@ -3,7 +3,7 @@ fixes: - | Fixes CoreDNS for Magnum clusters crashing on startup. - | - Allows cinder-csi nodeplugin to start on the same Magnum cluster host as + Allows cinder-csi nodeplugin to start on the same Magnum cluster host as cinder-csi controllerplugin. - | Corrects ClusterRole rules for Magnum cluster-autoscaler, and sets diff --git a/releasenotes/notes/update-rabbitmq-version-90fe988f516e090a.yaml b/releasenotes/notes/update-rabbitmq-version-90fe988f516e090a.yaml index 040ee58df..6158a25c3 100644 --- a/releasenotes/notes/update-rabbitmq-version-90fe988f516e090a.yaml +++ b/releasenotes/notes/update-rabbitmq-version-90fe988f516e090a.yaml @@ -4,4 +4,4 @@ features: Adds tags for new RabbitMQ containers to update to RabbitMQ version 3.9.22. upgrade: - | - Tags are added to update the RabbitMQ containers to version 3.9.22. \ No newline at end of file + Tags are added to update the RabbitMQ containers to version 3.9.22. From 2e3aad710f7bfac3d565f572e001b33c7871ca04 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 19 Jan 2023 15:22:18 +0100 Subject: [PATCH 09/10] Add release note for UEFI instance launch issues --- releasenotes/notes/nova-uefi-edk2-ovmf-d636c299e76728e8.yaml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 releasenotes/notes/nova-uefi-edk2-ovmf-d636c299e76728e8.yaml diff --git a/releasenotes/notes/nova-uefi-edk2-ovmf-d636c299e76728e8.yaml b/releasenotes/notes/nova-uefi-edk2-ovmf-d636c299e76728e8.yaml new file mode 100644 index 000000000..e75630ff0 --- /dev/null +++ b/releasenotes/notes/nova-uefi-edk2-ovmf-d636c299e76728e8.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fix creation of VM instances with UEFI enabled and Secure Boot disabled. From 7189ed26d7dd955526665b03c7511ed0305d7737 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 20 Jan 2023 14:06:11 +0100 Subject: [PATCH 10/10] Bump nova tag for Xena --- etc/kayobe/kolla/globals.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index c2c7ce5c6..3cb843778 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -10,6 +10,7 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts {% if kolla_base_distro == 'centos' %} bifrost_tag: xena-20221128T101757 magnum_tag: xena-20230111T093652 +nova_tag: xena-20230120T115956 rabbitmq_tag: xena-20230105T141714 {% else %} bifrost_tag: xena-20221213T224057