From ab4da7f5856fd026935b3e21c7c11d65a75c292c Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 21 Dec 2022 13:50:15 +0000 Subject: [PATCH 1/9] cephadm: Use quay.io for cephadm_image by default The default for cephadm_image was a poor choice, because ceph images are not synced to the local Pulp by default. Use quay.io when images are not locally synced. --- etc/kayobe/cephadm.yml | 2 +- etc/kayobe/environments/ci-multinode/cephadm.yml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/etc/kayobe/cephadm.yml b/etc/kayobe/cephadm.yml index 371336310..f326b0ae1 100644 --- a/etc/kayobe/cephadm.yml +++ b/etc/kayobe/cephadm.yml @@ -9,7 +9,7 @@ cephadm_ceph_release: "pacific" #cephadm_fsid: # Ceph container image. -cephadm_image: "{{ stackhpc_docker_registry }}/ceph/ceph:{{ cephadm_image_tag }}" +cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}" # Ceph container image tag. cephadm_image_tag: "v16.2.5" diff --git a/etc/kayobe/environments/ci-multinode/cephadm.yml b/etc/kayobe/environments/ci-multinode/cephadm.yml index b4cb2ca0d..addb37ddf 100644 --- a/etc/kayobe/environments/ci-multinode/cephadm.yml +++ b/etc/kayobe/environments/ci-multinode/cephadm.yml @@ -2,9 +2,6 @@ ############################################################################### # Cephadm deployment configuration. -# Ceph container image. -cephadm_image: "quay.io/ceph/ceph:v16.2.5" - # Ceph OSD specification. cephadm_osd_spec: service_type: osd From 1b5898dedf36806d5a4ea75109d0cb9f02ca67f1 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 21 Dec 2022 13:50:50 +0000 Subject: [PATCH 2/9] dnf: separate dnf_custom_repos from stackhpc_dnf_repos --- etc/kayobe/dnf.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/etc/kayobe/dnf.yml b/etc/kayobe/dnf.yml index 375fa30ff..dcbc5e8af 100644 --- a/etc/kayobe/dnf.yml +++ b/etc/kayobe/dnf.yml @@ -41,6 +41,12 @@ # file: myrepo # gpgkey: http://gpgkey # gpgcheck: yes +#dnf_custom_repos: + +# A dict of custom repositories that point to the local Pulp server. +# To use these repos, set dnf_custom_repos to the value of stackhpc_dnf_repos. +# This is done by default for hosts in the overcloud group via a group_vars +# file. stackhpc_dnf_repos: "{{ dnf_custom_repos_el8 | combine(lookup('vars', 'dnf_custom_repos_' ~ ansible_facts.distribution | lower )) }}" # Custom repositories shared between all RHEL derivatives. From bcd26d024efa79c531d0eb3b4555044d026c1160 Mon Sep 17 00:00:00 2001 From: Bartosz Bezak Date: Thu, 29 Dec 2022 10:27:45 +0100 Subject: [PATCH 3/9] add netbase and iputils-ping for ubuntu overcloud dib image netbase package is generating /etc/hosts file, among other things https://packages.debian.org/sid/netbase --- etc/kayobe/stackhpc-overcloud-dib.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/stackhpc-overcloud-dib.yml b/etc/kayobe/stackhpc-overcloud-dib.yml index 84fffbc0f..a39e59608 100644 --- a/etc/kayobe/stackhpc-overcloud-dib.yml +++ b/etc/kayobe/stackhpc-overcloud-dib.yml @@ -58,6 +58,8 @@ stackhpc_overcloud_dib_env_vars: stackhpc_overcloud_dib_packages: - "logrotate" - "net-tools" + - "{% if os_distribution == 'ubuntu' %}netbase{% endif %}" + - "{% if os_distribution == 'ubuntu' %}iputils-ping{% endif %}" # StackHPC overcloud DIB image block device configuration. # This image layout conforms to the CIS partition benchmarks. From 78055cf8e7d485154a1ff06e7dd1bd8f03e7fe00 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Thu, 29 Dec 2022 12:24:03 +0000 Subject: [PATCH 4/9] Sets kolla_docker_registry_insecure to true (#297) * Sets kolla_docker_registry_insecure to true We currently don't configure TLS for the the local pulp registry. This adds the pulp server to the list of insecure-registries, so that we can pull images. * Remove kolla_docker_registry_insecure override in CI environment Based on comments in code review. * Use a better default for kolla_docker_registry_insecure Hoping this will prevent breakage for people already running pulp with TLS. --- etc/kayobe/environments/ci-aio/stackhpc-ci.yml | 5 ----- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 5 ----- etc/kayobe/environments/ci-multinode/stackhpc-ci.yml | 5 ----- etc/kayobe/kolla.yml | 2 +- 4 files changed, 1 insertion(+), 16 deletions(-) diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml index a9827d82e..a874b9d7d 100644 --- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml @@ -5,11 +5,6 @@ # Docker namespace to use for Kolla images. Default is 'kolla'. kolla_docker_namespace: stackhpc-dev -# Whether docker should be configured to use an insecure registry for Kolla -# images. Default is false, unless docker_registry_enabled is true and -# docker_registry_enable_tls is false. -kolla_docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}" - ############################################################################### # Network configuration. diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 4a9e50f1c..0fce89039 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -5,11 +5,6 @@ # Docker namespace to use for Kolla images. Default is 'kolla'. kolla_docker_namespace: stackhpc-dev -# Whether docker should be configured to use an insecure registry for Kolla -# images. Default is false, unless docker_registry_enabled is true and -# docker_registry_enable_tls is false. -kolla_docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}" - # Kolla feature flag configuration. kolla_enable_barbican: true kolla_enable_central_logging: true diff --git a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml index 9cfccab43..3a1bedd31 100644 --- a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml @@ -5,11 +5,6 @@ # Docker namespace to use for Kolla images. Default is 'kolla'. kolla_docker_namespace: stackhpc-dev -# Whether docker should be configured to use an insecure registry for Kolla -# # images. Default is false, unless docker_registry_enabled is true and -# # docker_registry_enable_tls is false. -kolla_docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}" - ############################################################################### # Network configuration. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 920eb4caa..f98dd5a9a 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -84,7 +84,7 @@ kolla_docker_namespace: stackhpc # Whether docker should be configured to use an insecure registry for Kolla # images. Default is false, unless docker_registry_enabled is true and # docker_registry_enable_tls is false. -#kolla_docker_registry_insecure: +kolla_docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}" # Username to use to access a docker registry. Default is not set, in which # case the registry will be used without authentication. From efe5a7b8971c7bc80d512f63f182299534a9b5b0 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 22 Dec 2022 17:13:07 +0000 Subject: [PATCH 5/9] 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 de21305e89afb6099efcc7a3d706cf90478b13dc Mon Sep 17 00:00:00 2001 From: Dawud M <7688823+technowhizz@users.noreply.github.com> Date: Fri, 30 Dec 2022 19:49:05 +0000 Subject: [PATCH 6/9] Fix bug where old metrics wouldn't be overwritten The mv command wasnt overwriting the textcollector file. mv -f is now being used Additionally, serial numbers are now all lowercase --- etc/kayobe/ansible/scripts/smartmon.sh | 2 +- etc/kayobe/ansible/smartmon-tools.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/ansible/scripts/smartmon.sh b/etc/kayobe/ansible/scripts/smartmon.sh index bcac8b8b3..32b3ea81c 100644 --- a/etc/kayobe/ansible/scripts/smartmon.sh +++ b/etc/kayobe/ansible/scripts/smartmon.sh @@ -115,7 +115,7 @@ parse_smartctl_info() { case "${info_type}" in Model_Family) model_family="${info_value}" ;; Device_Model) device_model="${info_value}" ;; - Serial_Number) serial_number="${info_value}" ;; + Serial_Number) serial_number="$(echo ${info_value} | tr '[:upper:]' '[:lower:]')" ;; Firmware_Version) fw_version="${info_value}" ;; Vendor) vendor="${info_value}" ;; Product) product="${info_value}" ;; diff --git a/etc/kayobe/ansible/smartmon-tools.yml b/etc/kayobe/ansible/smartmon-tools.yml index 6b275c264..e23e32396 100644 --- a/etc/kayobe/ansible/smartmon-tools.yml +++ b/etc/kayobe/ansible/smartmon-tools.yml @@ -36,7 +36,7 @@ name: "SMART metrics for drive monitoring using {{ item }}" user: root minute: "*/5" - job: "/usr/local/bin/{{ item }}.sh > /var/lib/docker/volumes/textfile/_data/{{ item }}.prom.temp && mv /var/lib/docker/volumes/textfile/_data/{{ item }}.prom.temp /var/lib/docker/volumes/textfile/_data/{{ item }}.prom" + job: "/usr/local/bin/{{ item }}.sh > /var/lib/docker/volumes/textfile/_data/{{ item }}.prom.temp && mv -f /var/lib/docker/volumes/textfile/_data/{{ item }}.prom.temp /var/lib/docker/volumes/textfile/_data/{{ item }}.prom" loop: - smartmon - nvmemon From 812657d86a572e39fc9273ba89e905b30c261d5f Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 3 Jan 2023 15:17:16 +0000 Subject: [PATCH 7/9] 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 8/9] 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 %} ############################################################################# From 5a9fe7efebb613bdeef60d4f6a2c75e6e5f6cc3e Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Thu, 5 Jan 2023 09:30:01 +0000 Subject: [PATCH 9/9] Remove Ubuntu OVN/OVS bump release note This does not apply to Yoga. --- .../notes/ubuntu-bump-ovn-ovs-ed99bcac9f8bd7ca.yaml | 12 ------------ 1 file changed, 12 deletions(-) delete mode 100644 releasenotes/notes/ubuntu-bump-ovn-ovs-ed99bcac9f8bd7ca.yaml diff --git a/releasenotes/notes/ubuntu-bump-ovn-ovs-ed99bcac9f8bd7ca.yaml b/releasenotes/notes/ubuntu-bump-ovn-ovs-ed99bcac9f8bd7ca.yaml deleted file mode 100644 index 4357553cf..000000000 --- a/releasenotes/notes/ubuntu-bump-ovn-ovs-ed99bcac9f8bd7ca.yaml +++ /dev/null @@ -1,12 +0,0 @@ ---- -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