From efe5a7b8971c7bc80d512f63f182299534a9b5b0 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 22 Dec 2022 17:13:07 +0000 Subject: [PATCH 1/3] Ubuntu: bump OVN & Open vSwitch packages The Open vSwitch and OVN packages in Ubuntu Wallaby UCA repository are quite old - 2.15 and 20.12 respectively. Pull in these packages from the Yoga UCA, which are 2.17 and 22.03, to more closely match the CentOS packages. This change uses newly built containers with these packages. --- etc/kayobe/kolla/globals.yml | 7 +++++++ .../notes/ubuntu-bump-ovn-ovs-ed99bcac9f8bd7ca.yaml | 12 ++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 releasenotes/notes/ubuntu-bump-ovn-ovs-ed99bcac9f8bd7ca.yaml diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index b6071fe1b..593d0d8a3 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -8,4 +8,11 @@ bifrost_tag: wallaby-20220921T100954 {% else %} bifrost_tag: wallaby-20220825T112231 cloudkitty_tag: wallaby-20221215T220154 +kolla_toolbox_tag: wallaby-20221222T161624 +neutron_tag: wallaby-20221222T161624 +neutron_tls_proxy_tag: "{% raw %}{{ openstack_tag }}{% endraw %}" +nova_tag: wallaby-20221222T161624 +octavia_tag: wallaby-20221222T161624 +openvswitch_tag: wallaby-20221222T161624 +ovn_tag: wallaby-20221222T161624 {% endif %} diff --git a/releasenotes/notes/ubuntu-bump-ovn-ovs-ed99bcac9f8bd7ca.yaml b/releasenotes/notes/ubuntu-bump-ovn-ovs-ed99bcac9f8bd7ca.yaml new file mode 100644 index 000000000..4357553cf --- /dev/null +++ b/releasenotes/notes/ubuntu-bump-ovn-ovs-ed99bcac9f8bd7ca.yaml @@ -0,0 +1,12 @@ +--- +features: + - | + Update Open vSwitch to 2.17 and OVN to 22.03 in Ubuntu images. This affects + the following services: + + * kolla-toolbox + * neutron + * nova + * octavia + * openvswitch + * ovn From 812657d86a572e39fc9273ba89e905b30c261d5f Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 3 Jan 2023 15:17:16 +0000 Subject: [PATCH 2/3] CI: Pin Rocky8 to an older image The current SMS lab Rocky8 image has moved ahead of our release train snapshots, causing failures installing some packages. TASK [stackhpc.libvirt-host : Ensure libvirt packages are installed] *********** FAILED - RETRYING: Ensure libvirt packages are installed (3 retries left). FAILED - RETRYING: Ensure libvirt packages are installed (2 retries left). FAILED - RETRYING: Ensure libvirt packages are installed (1 retries left). fatal: [controller0]: FAILED! => {"attempts": 3, "changed": false, "msg": "Failed to download packages: libverto-0.3.0-5.el8.x86_64: Cannot download, all mirrors were already tried without success", "results": []} --- .github/workflows/stackhpc-pull-request.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stackhpc-pull-request.yml b/.github/workflows/stackhpc-pull-request.yml index 49f5cb6b6..fb792347c 100644 --- a/.github/workflows/stackhpc-pull-request.yml +++ b/.github/workflows/stackhpc-pull-request.yml @@ -72,7 +72,9 @@ jobs: kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }} os_distribution: rocky neutron_plugin: ovs - vm_image: Rocky8 + # NOTE: The current SMS lab Rocky8 image has moved ahead of our release + # train snapshots, causing failures installing some packages. + vm_image: Rocky8-2022-11-08 vm_interface: ens3 OS_CLOUD: sms-lab-release secrets: inherit @@ -87,7 +89,9 @@ jobs: kayobe_image: ${{ needs.build-kayobe-image.outputs.kayobe_image }} os_distribution: rocky neutron_plugin: ovn - vm_image: Rocky8 + # NOTE: The current SMS lab Rocky8 image has moved ahead of our release + # train snapshots, causing failures installing some packages. + vm_image: Rocky8-2022-11-08 vm_interface: ens3 OS_CLOUD: sms-lab-release secrets: inherit From b0bc77f0fed90bdced0146b1261cfdd9d881b7fa Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 4 Jan 2023 17:00:07 +0000 Subject: [PATCH 3/3] Ubuntu: bump OVN & Open vSwitch packages The Open vSwitch and OVN packages in Ubuntu Xena UCA repository are quite old - 2.15 and 20.12 respectively. Pull in these packages from the Yoga UCA, which are 2.17 and 22.03, to more closely match the CentOS packages. This change uses newly built containers with these packages. --- etc/kayobe/kolla/globals.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 7d15d542d..85d72d700 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -11,6 +11,13 @@ enable_docker_repo: {% raw %}"{{ 'overcloud' not in group_names or ansible_facts bifrost_tag: xena-20221128T101757 {% else %} bifrost_tag: xena-20221213T224057 +kolla_toolbox_tag: xena-20230104T145414 +neutron_tag: xena-20230104T145414 +neutron_tls_proxy_tag: "{% raw %}{{ openstack_tag }}{% endraw %}" +nova_tag: xena-20230104T145414 +octavia_tag: xena-20230104T145414 +openvswitch_tag: xena-20230104T145414 +ovn_tag: xena-20230104T145414 {% endif %} #############################################################################