Xena: update package repositories and Kolla image build config

Author: markgoddard

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

@@ -27,13 +27,15 @@ stackhpc_repo_epel_version: "{{ stackhpc_pulp_repo_epel_version }}"
 stackhpc_repo_epel_modular_version: "{{ stackhpc_pulp_repo_epel_modular_version }}"
 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_wallaby_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_wallaby_version }}"
+stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_xena_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_opstools_version: "{{ stackhpc_pulp_repo_centos_8_opstools_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_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

@@ -46,13 +46,15 @@ stackhpc_repo_epel_version: "{{ stackhpc_pulp_repo_epel_version }}"
 stackhpc_repo_epel_modular_version: "{{ stackhpc_pulp_repo_epel_modular_version }}"
 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_wallaby_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_wallaby_version }}"
+stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_xena_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_opstools_version: "{{ stackhpc_pulp_repo_centos_8_opstools_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_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/kolla.yml

@@ -108,19 +108,19 @@ kolla_sources:
   barbican-base:
     type: git
     location: "https://github.com/stackhpc/barbican.git"
-    reference: stackhpc/wallaby
+    reference: stackhpc/xena
   bifrost-base:
     type: git
     location: "{{ kolla_bifrost_source_url }}"
     reference: "{{ kolla_bifrost_source_version }}"
   cloudkitty-base:
     type: git
     location: https://github.com/stackhpc/cloudkitty.git
-    reference: stackhpc/wallaby
+    reference: stackhpc/xena
   horizon-plugin-cloudkitty-dashboard:
     type: git
     location: https://github.com/stackhpc/cloudkitty-dashboard.git
-    reference: stackhpc/wallaby
+    reference: stackhpc/xena
   ironic-inspector-additions-stackhpc-inspector-plugins:
     # Install our custom inspector plugins.
     type: git
@@ -129,11 +129,11 @@ kolla_sources:
   magnum-base:
     type: git
     location: https://github.com/stackhpc/magnum.git
-    reference: stackhpc/wallaby
+    reference: stackhpc/xena
   neutron-base-plugin-networking-generic-switch:
     type: git
     location: https://github.com/stackhpc/networking-generic-switch.git
-    reference: stackhpc/wallaby
+    reference: stackhpc/xena
 
 ###############################################################################
 # Kolla image build configuration.
@@ -158,14 +158,16 @@ stackhpc_epel_repos:
 stackhpc_centos_additional_repos:
   - url: "{{ stackhpc_repo_centos_stream_advanced_virtualization_url }}"
     file: "CentOS-Advanced-Virtualization.repo"
+  - url: "{{ stackhpc_repo_centos_stream_nfv_extras_url }}"
+    file: "CentOS-NFV-extras.repo"
   - url: "{{ stackhpc_repo_centos_stream_nfv_openvswitch_url }}"
     file: "CentOS-NFV-OpenvSwitch.repo"
-  - url: "{{ stackhpc_repo_centos_stream_openstack_wallaby_url }}"
-    file: "CentOS-OpenStack-wallaby.repo"
+  - url: "{{ stackhpc_repo_centos_stream_openstack_xena_url }}"
+    file: "CentOS-OpenStack-xena.repo"
+  - url: "{{ stackhpc_repo_centos_stream_opstools_url }}"
+    file: "CentOS-OpsTools.repo"
   - url: "{{ stackhpc_repo_centos_stream_powertools_url }}"
     file: "CentOS-Stream-PowerTools.repo"
-  - url: "{{ stackhpc_repo_centos_opstools_url }}"
-    file: "CentOS-OpsTools.repo"
   - url: "{{ stackhpc_repo_centos_stream_storage_ceph_pacific_url }}"
     file: "CentOS-Ceph-Pacific.repo"
 
@@ -175,6 +177,8 @@ stackhpc_third_party_repos:
     file: "elasticsearch.repo"
   - url: "{{ stackhpc_repo_grafana_url }}"
     file: "grafana.repo"
+  - url: "{{ stackhpc_repo_mariadb_10_5_centos8_url }}"
+    file: "mariadb.repo"
   - url: "{{ stackhpc_repo_rabbitmq_erlang_url }}"
     file: "rabbitmq_rabbitmq-erlang.repo"
   - url: "{{ stackhpc_repo_rabbitmq_server_url }}"
@@ -231,6 +235,8 @@ kolla_build_blocks:
 # customization is most commonly packages. The operation should be one of
 # override, append or remove. The value should be a list.
 kolla_build_customizations:
+  base_yum_repo_files_remove:
+    - proxysql.repo
   ironic_inspector_pip_packages_append:
     - /additions/*
   ovn_base_packages_override:

etc/kayobe/pulp-repo-versions.yml

@@ -1,20 +1,21 @@
 ---
 # Do not edit! This file is autogenerated by Ansible.
-stackhpc_pulp_repo_centos_8_opstools_version: 20211122T102435
-stackhpc_pulp_repo_centos_8_storage_ceph_nautilus_version: 20211122T102435
 stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435
 stackhpc_pulp_repo_centos_stream_8_appstream_version: 20211122T102435
 stackhpc_pulp_repo_centos_stream_8_baseos_version: 20211122T102435
 stackhpc_pulp_repo_centos_stream_8_extras_version: 20211122T102435
+stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: ''
 stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220223T025353
-stackhpc_pulp_repo_centos_stream_8_openstack_wallaby_version: 20211122T102435
+stackhpc_pulp_repo_centos_stream_8_openstack_xena_version: ''
+stackhpc_pulp_repo_centos_stream_8_opstools_version: ''
 stackhpc_pulp_repo_centos_stream_8_powertools_version: 20211122T102435
 stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20211210T124731
 stackhpc_pulp_repo_docker_version: 20211122T102435
 stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20211122T102435
 stackhpc_pulp_repo_epel_modular_version: 20211122T102435
 stackhpc_pulp_repo_epel_version: 20211122T102435
 stackhpc_pulp_repo_grafana_version: 20220119T030911
+stackhpc_pulp_repo_mariadb_10_5_centos8_version: ''
 stackhpc_pulp_repo_rabbitmq_erlang_version: 20211122T102435
 stackhpc_pulp_repo_rabbitmq_server_version: 20211122T102435
 stackhpc_pulp_repo_treasuredata_4_version: 20211122T102435

etc/kayobe/stackhpc.yml

@@ -33,22 +33,26 @@ stackhpc_repo_docker_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_centos_stream_advanced_virtualization_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/virt/x86_64/advancedvirt-common/{{ stackhpc_repo_centos_stream_advanced_virtualization_version }}"
 stackhpc_repo_centos_stream_advanced_virtualization_version: "{{ stackhpc_repo_distribution }}"
 
+# CentOS Stream 8 - NFV Extras
+stackhpc_repo_centos_stream_nfv_extras_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/nfv/x86_64/network-extras/{{ stackhpc_repo_centos_stream_nfv_extras_version }}"
+stackhpc_repo_centos_stream_nfv_extras_version: "{{ stackhpc_repo_distribution }}"
+
 # CentOS Stream 8 - NFV OpenvSwitch
 stackhpc_repo_centos_stream_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_repo_centos_stream_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"
 
-# CentOS Stream 8 - OpenStack Wallaby
-stackhpc_repo_centos_stream_openstack_wallaby_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/cloud/x86_64/openstack-wallaby/{{ stackhpc_repo_centos_stream_openstack_wallaby_version }}"
-stackhpc_repo_centos_stream_openstack_wallaby_version: "{{ stackhpc_repo_distribution }}"
+# CentOS Stream 8 - OpenStack Xena
+stackhpc_repo_centos_stream_openstack_xena_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/cloud/x86_64/openstack-xena/{{ stackhpc_repo_centos_stream_openstack_xena_version }}"
+stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_repo_distribution }}"
+
+# CentOS Stream 8 - OpsTools - collectd
+stackhpc_repo_centos_stream_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_opstools_version }}"
+stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_repo_distribution }}"
 
 # CentOS Stream 8 - PowerTools
 stackhpc_repo_centos_stream_powertools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/PowerTools/x86_64/os/{{ stackhpc_repo_centos_stream_powertools_version }}"
 stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_repo_distribution }}"
 
-# CentOS 8 - OpsTools - collectd
-stackhpc_repo_centos_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_opstools_version }}"
-stackhpc_repo_centos_opstools_version: "{{ stackhpc_repo_distribution }}"
-
 # CentOS Stream 8 - Ceph Pacific
 stackhpc_repo_centos_stream_storage_ceph_pacific_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/storage/x86_64/ceph-pacific/{{ stackhpc_repo_centos_stream_storage_ceph_pacific_version }}"
 stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_repo_distribution }}"
@@ -61,6 +65,10 @@ stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_repo_distr
 stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/oss/rpm/{{ stackhpc_repo_grafana_version }}"
 stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}"
 
+# MariaDB 10.5 CentOS 8
+stackhpc_repo_mariadb_10_5_centos8_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.5/yum/centos8-amd64/{{ stackhpc_repo_mariadb_10_5_centos8_version }}"
+stackhpc_repo_mariadb_10_5_centos8_version: "{{ stackhpc_repo_distribution }}"
+
 # RabbitMQ - Erlang
 stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}"
 stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_repo_distribution }}"