Xena: sync with Wallaby

.github/workflows/stackhpc-all-in-one.yml

@@ -232,3 +232,8 @@ jobs:
           OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }}
           OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }}
         if: always()
+
+      - name: Prune Docker images over 1 week old
+        # May fail if another prune is running
+        run: sudo docker image prune --force --filter until=168h || true
+        if: always()

.github/workflows/stackhpc-container-image-build.yml

@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: stackhpc/kayobe
-          ref: refs/heads/stackhpc/xena
+          ref: refs/heads/stackhpc/yoga
           path: src/kayobe
 
       # FIXME: Failed in kolla-ansible : Ensure the latest version of pip is installed

.github/workflows/stackhpc-promote.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches:
       # NOTE(mgoddard): Reference only the current release branch here.
-      - stackhpc/xena
+      - stackhpc/yoga
 jobs:
   promote:
     name: Trigger package repository promotion

.github/workflows/tag-and-release.yml

@@ -3,7 +3,7 @@ name: Tag & Release
 'on':
   push:
     branches:
-      - stackhpc/xena
+      - stackhpc/yoga
 permissions:
   contents: write
 jobs:

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe-config.git
-defaultbranch=stable/xena
+defaultbranch=stable/yoga

README.rst

@@ -2,7 +2,7 @@
 StackHPC Kayobe Configuration
 =============================
 
-This repository provides a base Kayobe configuration for the Xena release
+This repository provides a base Kayobe configuration for the Yoga release
 of StackHPC OpenStack.
 
 StackHPC release train
@@ -45,7 +45,7 @@ when used with Kayobe's `multiple environments
 feature.
 
 This configuration should be consumed using the `StackHPC Kayobe fork
-<https://github.com/stackhpc/kayobe/tree/stackhpc/xena>`__, which includes
+<https://github.com/stackhpc/kayobe/tree/stackhpc/yoga>`__, which includes
 backported support for Ansible collections.
 
 New deployments
@@ -56,7 +56,7 @@ your configuration.
 
 .. code-block:: console
 
-   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena
+   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/yoga
 
 Existing deployments
 --------------------
@@ -68,7 +68,7 @@ need to merge the changes in this repository into your repository.
 
    git remote add stackhpc https://github.com/stackhpc/stackhpc-kayobe-config
    git fetch stackhpc
-   git merge stackhpc/stackhpc/xena
+   git merge stackhpc/stackhpc/yoga
 
 Updating
 --------
@@ -80,7 +80,7 @@ consume these updates by merging in the changes with their local configuration.
 .. code-block:: console
 
    git fetch stackhpc
-   git merge stackhpc/stackhpc/xena
+   git merge stackhpc/stackhpc/yoga
 
 The intention is to avoid merge conflicts where possible, but there may be
 cases where this is difficult. We are open to discussion on how best to
@@ -125,13 +125,13 @@ Usage
 =====
 
 The local Pulp service will be deployed as a `Seed custom container
-<https://docs.openstack.org/kayobe/xena/configuration/reference/seed-custom-containers.html>`__
+<https://docs.openstack.org/kayobe/yoga/configuration/reference/seed-custom-containers.html>`__
 on next ``kayobe seed service deploy`` or ``kayobe seed service upgrade``.
 
 The following custom playbooks are provided in ``etc/kayobe/ansible/``:
 
 See the Kayobe `custom playbook documentation
-<https://docs.openstack.org/kayobe/xena/custom-ansible-playbooks.html>`__
+<https://docs.openstack.org/kayobe/yoga/custom-ansible-playbooks.html>`__
 for information on how to run them.
 
 * ``pulp-repo-sync.yml``: Pull packages from Ark to the local Pulp. This will
@@ -260,8 +260,8 @@ Clone the Kayobe and Kayobe configuration repositories (this one):
    cd
    mkdir -p src
    pushd src
-   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/xena
-   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena kayobe-config
+   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/yoga
+   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/yoga kayobe-config
    popd
 
 Create a virtual environment and install Kayobe:
@@ -374,8 +374,8 @@ Clone the Kayobe and Kayobe configuration repositories (this one):
    cd
    mkdir -p src
    pushd src
-   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/xena
-   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena kayobe-config
+   git clone https://github.com/stackhpc/kayobe.git -b stackhpc/yoga
+   git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/yoga kayobe-config
    popd
 
 Create a virtual environment and install Kayobe:
@@ -440,7 +440,7 @@ At this point you are ready to build and push some container images.
    kayobe seed container image build --push
    kayobe overcloud container image build --push
 
-The container images are tagged as ``xena-<datetime>``. This Kayobe
+The container images are tagged as ``yoga-<datetime>``. This Kayobe
 configuration includes a hook that writes the tag to ``~/kolla_tag``, since
 it is not always simple to determine which tag was last applied to built
 images.
@@ -452,7 +452,7 @@ tag as the value of the ``kolla_openstack_release`` variable.
 Resources
 =========
 
-* Kayobe documentation: https://docs.openstack.org/kayobe/xena/
+* Kayobe documentation: https://docs.openstack.org/kayobe/yoga/
 * Kayobe source: https://opendev.org/openstack/kayobe
 * Kayobe bugs: https://storyboard.openstack.org/#!/project/openstack/kayobe-config
 * IRC: #openstack-kolla

etc/kayobe/apt.yml

@@ -21,11 +21,12 @@
 
 # List of apt keys. Each item is a dict containing the following keys:
 # * url: URL of key
-# * filename: Name of a file in which to store the downloaded key
+# * filename: Name of a file in which to store the downloaded key. The
+#   extension should be '.asc' for ASCII-armoured keys, or '.gpg' otherwise.
 # Default is an empty list.
 #apt_keys:
 
-# A list of Apt repositories.
+# A list of Apt repositories. Each item is a dict with the following keys:
 # * types: whitespace-separated list of repository types, e.g. deb or deb-src
 #   (optional, default is 'deb')
 # * url: URL of the repository

etc/kayobe/dnf.yml

@@ -109,8 +109,8 @@ dnf_enable_epel: "{{ dnf_install_epel | bool }}"
 dnf_epel_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8"
 
 # Whether to install the epel-release package. This affects RedHat-based
-# systems only. Default value is 'true'.
-dnf_install_epel: false
+# systems only. Default value is 'false'.
+#dnf_install_epel:
 
 ###############################################################################
 # DNF Automatic configuration.

etc/kayobe/environments/ci-aio/stackhpc-ci.yml

@@ -34,13 +34,13 @@ stackhpc_repo_docker_version: "{{ stackhpc_pulp_repo_docker_version }}"
 stackhpc_repo_centos_stream_advanced_virtualization_version: "{{ stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version }}"
 stackhpc_repo_centos_stream_nfv_extras_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_extras_version }}"
 stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version }}"
-stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_xena_version }}"
+stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version }}"
 stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
 stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
 stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
 stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
-stackhpc_repo_mariadb_10_5_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_5_centos8_version }}"
+stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}"
 stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
 stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
 stackhpc_repo_treasuredata_4_version: "{{ stackhpc_pulp_repo_treasuredata_4_version }}"

etc/kayobe/environments/ci-builder/stackhpc-ci.yml

@@ -54,13 +54,13 @@ stackhpc_repo_docker_version: "{{ stackhpc_pulp_repo_docker_version }}"
 stackhpc_repo_centos_stream_advanced_virtualization_version: "{{ stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version }}"
 stackhpc_repo_centos_stream_nfv_extras_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_extras_version }}"
 stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version }}"
-stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_xena_version }}"
+stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version }}"
 stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}"
 stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}"
 stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}"
 stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}"
 stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}"
-stackhpc_repo_mariadb_10_5_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_5_centos8_version }}"
+stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}"
 stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}"
 stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rabbitmq_server_version }}"
 stackhpc_repo_treasuredata_4_version: "{{ stackhpc_pulp_repo_treasuredata_4_version }}"

etc/kayobe/infra-vms.yml

@@ -35,7 +35,7 @@
 # http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2
 # when os_distribution is "rocky",
 # or
-# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2"
+# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2"
 # otherwise.
 #infra_vm_root_image:
 

etc/kayobe/kolla.yml

@@ -96,7 +96,7 @@ kolla_docker_registry_password: "{{ stackhpc_docker_registry_password }}"
 
 # Kolla OpenStack release version. This should be a Docker image tag.
 # Default is {{ openstack_release }}.
-kolla_openstack_release: xena-20221010T103511
+kolla_openstack_release: yoga-20221007T094200
 
 # Docker tag applied to built container images. Default is
 # {{ kolla_openstack_release }}.
@@ -111,10 +111,6 @@ kolla_openstack_release: xena-20221010T103511
 #     location: https://github.com/openstack/ironic
 #     reference: master
 kolla_sources:
-  bifrost-base:
-    type: git
-    location: "{{ kolla_bifrost_source_url }}"
-    reference: "{{ kolla_bifrost_source_version }}"
   bifrost-base-additions-stackhpc-inspector-plugins:
     # Install our custom inspector plugins.
     type: git
@@ -123,11 +119,11 @@ kolla_sources:
   cloudkitty-base:
     type: git
     location: https://github.com/stackhpc/cloudkitty.git
-    reference: stackhpc/xena
+    reference: stackhpc/{{ openstack_release }}
   horizon-plugin-cloudkitty-dashboard:
     type: git
     location: https://github.com/stackhpc/cloudkitty-dashboard.git
-    reference: stackhpc/xena
+    reference: stackhpc/{{ openstack_release }}
   ironic-inspector-additions-stackhpc-inspector-plugins:
     # Install our custom inspector plugins.
     type: git
@@ -136,11 +132,11 @@ kolla_sources:
   magnum-base:
     type: git
     location: https://github.com/stackhpc/magnum.git
-    reference: stackhpc/xena
+    reference: stackhpc/{{ openstack_release }}
   neutron-base-plugin-networking-generic-switch:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git
-    reference: stackhpc/xena
+    reference: stackhpc/{{ openstack_release }}
 
 ###############################################################################
 # Kolla image build configuration.
@@ -169,8 +165,8 @@ stackhpc_centos_additional_repos:
     file: "CentOS-NFV-extras.repo"
   - url: "{{ stackhpc_repo_centos_stream_nfv_openvswitch_url }}"
     file: "CentOS-NFV-OpenvSwitch.repo"
-  - url: "{{ stackhpc_repo_centos_stream_openstack_xena_url }}"
-    file: "CentOS-OpenStack-xena.repo"
+  - url: "{{ stackhpc_repo_centos_stream_openstack_yoga_url }}"
+    file: "CentOS-OpenStack-yoga.repo"
   - url: "{{ stackhpc_repo_centos_stream_opstools_url }}"
     file: "CentOS-OpsTools.repo"
   - url: "{{ stackhpc_repo_centos_stream_powertools_url }}"
@@ -184,7 +180,7 @@ stackhpc_third_party_repos:
     file: "elasticsearch.repo"
   - url: "{{ stackhpc_repo_grafana_url }}"
     file: "grafana.repo"
-  - url: "{{ stackhpc_repo_mariadb_10_5_centos8_url }}"
+  - url: "{{ stackhpc_repo_mariadb_10_6_centos8_url }}"
     file: "mariadb.repo"
   - url: "{{ stackhpc_repo_rabbitmq_erlang_url }}"
     file: "rabbitmq_rabbitmq-erlang.repo"
@@ -456,6 +452,7 @@ kolla_build_args:
 #kolla_enable_ceilometer:
 #kolla_enable_ceilometer_horizon_policy_file:
 #kolla_enable_ceilometer_ipmi:
+#kolla_enable_ceilometer_prometheus_pushgateway:
 #kolla_enable_cells:
 kolla_enable_central_logging: true
 #kolla_enable_ceph_rgw:
@@ -516,7 +513,6 @@ kolla_enable_grafana: true
 #kolla_enable_horizon_zun:
 #kolla_enable_influxdb:
 #kolla_enable_ironic:
-#kolla_enable_ironic_ipxe:
 #kolla_enable_ironic_neutron_agent:
 #kolla_enable_ironic_pxe_uefi:
 #kolla_enable_iscsid:
@@ -563,6 +559,7 @@ kolla_enable_grafana: true
 #kolla_enable_nova:
 #kolla_enable_nova_fake:
 #kolla_enable_nova_horizon_policy_file:
+#kolla_enable_nova_libvirt_container:
 #kolla_enable_nova_serialconsole_proxy:
 #kolla_enable_nova_ssh:
 #kolla_enable_octavia:
@@ -580,6 +577,7 @@ kolla_enable_prometheus: true
 #kolla_enable_prometheus_cadvisor:
 #kolla_enable_prometheus_ceph_mgr_exporter:
 #kolla_enable_prometheus_elasticsearch_exporter:
+#kolla_enable_prometheus_etcd_integration:
 #kolla_enable_prometheus_fluentd_integration:
 #kolla_enable_prometheus_haproxy_exporter:
 #kolla_enable_prometheus_libvirt_exporter:
@@ -604,9 +602,9 @@ kolla_enable_prometheus: true
 #kolla_enable_telegraf:
 #kolla_enable_trove:
 #kolla_enable_trove_singletenant:
+#kolla_enable_venus:
 #kolla_enable_vitrage:
 #kolla_enable_vitrage_prometheus_datasource:
-#kolla_enable_vmtp:
 #kolla_enable_watcher:
 #kolla_enable_zookeeper:
 #kolla_enable_zun:
@@ -652,9 +650,6 @@ kolla_enable_prometheus: true
 # certificate bundle for the external API.
 #
 # Note that this should be formatted as a literal style block scalar.
-#
-# NOTE: kolla_tls_cert has been renamed to kolla_external_tls_cert. Support for
-# the deprecated name kolla_tls_cert will be removed in a future release.
 #kolla_external_tls_cert:
 
 # Path to a CA certificate file to use for the OS_CACERT environment variable

etc/kayobe/kolla/globals.yml

@@ -3,6 +3,10 @@
 docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}"
 docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg"
 
+{% if kolla_base_distro == 'centos' %}
+bifrost_tag: yoga-20221007T134036
+{% endif %}
+
 # Monitoring and alerting related settings
 es_heap_size: 8g
-prometheus_cmdline_extras: "--storage.tsdb.retention.time=30d"
+prometheus_cmdline_extras: "--storage.tsdb.retention.time=30d"

etc/kayobe/networks.yml

@@ -196,6 +196,15 @@
 # 'name' items. These tables will be added to /etc/iproute2/rt_tables.
 #network_route_tables:
 
+###############################################################################
+# Network connectivity check configuration.
+
+# External IP address to check. Default is 8.8.8.8.
+#nc_external_ip:
+
+# External hostname to check. Default is google.com.
+#nc_external_hostname:
+
 ###############################################################################
 # Dummy variable to allow Ansible to accept this file.
 workaround_ansible_issue_8743: yes

etc/kayobe/openstack.yml

@@ -2,10 +2,10 @@
 ###############################################################################
 # OpenStack release configuration.
 
-# Name of the current OpenStack release. Default is "xena".
+# Name of the current OpenStack release. Default is "yoga".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/xena".
+# Name of the current OpenStack branch. Default is "stable/yoga".
 #openstack_branch:
 
 ###############################################################################

etc/kayobe/pulp-repo-versions.yml

@@ -6,17 +6,17 @@ stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220817T082321
 stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901
 stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: 20220609T110556
 stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220824T113700
-stackhpc_pulp_repo_centos_stream_8_openstack_xena_version: 20220823T042339
+stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20220819T111114
 stackhpc_pulp_repo_centos_stream_8_opstools_version: 20220617T100837
 stackhpc_pulp_repo_centos_stream_8_powertools_version: 20220817T082321
 stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20220803T043053
-stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220708T132615
+stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220828T050510
 stackhpc_pulp_repo_docker_version: 20220828T050510
 stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20220825T041159
 stackhpc_pulp_repo_epel_modular_version: 20220828T050510
 stackhpc_pulp_repo_epel_version: 20220830T054227
 stackhpc_pulp_repo_grafana_version: 20220831T050502
-stackhpc_pulp_repo_mariadb_10_5_centos8_version: 20220817T082321
+stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20220819T111114
 stackhpc_pulp_repo_rabbitmq_erlang_version: 20220828T050510
 stackhpc_pulp_repo_rabbitmq_server_version: 20220803T043053
 stackhpc_pulp_repo_treasuredata_4_version: 20220823T042339