Merge remote-tracking branch 'origin/stackhpc/yoga' into yoga-opensearch-pin

Author: bbezak

etc/kayobe/ansible/stop-openstack-services.yml

@@ -0,0 +1,29 @@
+---
+# Stops containers running OpenStack services
+
+- name: Stop OpenStack services
+  hosts: overcloud
+  become: true
+  gather_facts: false
+  vars:
+    - stop_service_list:
+        - "blazar"
+        - "barbican"
+        - "cinder"
+        - "cloudkitty"
+        - "designate"
+        - "glance"
+        - "heat"
+        - "horizon"
+        - "ironic"
+        - "keystone"
+        - "magnum"
+        - "manila"
+        - "neutron"
+        - "nova"
+        - "octavia"
+        - "placement"
+  tasks:
+    - name: Stop OpenStack services
+      shell: >-
+        docker ps -a | egrep '({{ stop_service_list | join('|') }})' | awk '{ print $NF }' | xargs docker stop

etc/kayobe/kolla/kolla-build.conf

@@ -1,6 +1,11 @@
 [DEFAULT]
-{# Pinning to Rocky 9 minor version used in our repos #}
-{% if kolla_base_distro == 'rocky' %}
+{# Packages in the latest upstream Ubuntu base image can be ahead of our package repo #}
+{# snapshots, so pin to a specific tag. #}
+{# This tag should be updated when Ubuntu package repo snapshot versions are changed. #}
+{% if kolla_base_distro == 'ubuntu' %}
+base_tag = focal-20231003
+{# Similarly pinning to Rocky 9 minor version used in our repos #}
+{% elif kolla_base_distro == 'rocky' %}
 base_tag = 9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}
 {% endif %}
 build_args = {{ kolla_build_args.items() | map('join', ':') | join(',') }}

releasenotes/notes/pin-focal-baseimage-baafa2583f952596.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Pin the OCI image tag used for the Ubuntu Focal base-image
+    of Kolla image builds. This prevents packages in the image
+    with the latest tag getting in front of StackHPC release-train
+    package repositories. Ubuntu tag should be bumped when new
+    packages are available in StackHPC release-train.

releasenotes/notes/stop-services-playbook-b85b53d1a7571009.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Added the ``stop-openstack-services.yml`` playbook, which can be used to
+    stop OpenStack services across the overcloud.