re-introduce openstack-epoxy repo to R9 (#1799)

Author: bbezak

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

@@ -30,6 +30,7 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
+stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

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

@@ -55,6 +55,7 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
+stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

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

@@ -30,6 +30,7 @@ stackhpc_repo_ubuntu_noble_security_version: "{{ stackhpc_pulp_repo_ubuntu_noble
 stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}"
 stackhpc_repo_docker_ce_ubuntu_noble_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_noble_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}"
+stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_storage_ceph_squid_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version }}"
 stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}"

etc/kayobe/kolla-image-tags.yml

@@ -4,13 +4,5 @@
 # where the key is the OS distro and the value is the tag to deploy.
 kolla_image_tags:
   openstack:
-    rocky-9: 2025.1-rocky-9-20250616T133037
+    rocky-9: 2025.1-rocky-9-20250728T150626
     ubuntu-noble: 2025.1-ubuntu-noble-20250725T143116
-  bifrost:
-    rocky-9: 2025.1-rocky-9-20250626T152358
-  neutron_bgp_dragent:
-    rocky-9: 2025.1-rocky-9-20250715T140744
-  neutron_metadata_agent:
-    rocky-9: 2025.1-rocky-9-20250626T074649
-  proxysql:
-    rocky-9: 2025.1-rocky-9-20250701T091924

etc/kayobe/kolla.yml

@@ -171,6 +171,9 @@ stackhpc_rocky_9_additional_repos:
   - url: "{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_url }}"
     file: "CentOS-NFV-OpenvSwitch.repo"
     tag: "centos-nfv-openvswitch"
+  - url: "{{ stackhpc_repo_centos_stream_9_openstack_epoxy_url }}"
+    file: "CentOS-OpenStack-epoxy.repo"
+    tag: "centos-openstack-epoxy"
   - url: "{{ stackhpc_repo_centos_stream_9_opstools_url }}"
     file: "CentOS-OpsTools.repo"
     tag: "centos-opstools"
@@ -288,6 +291,12 @@ kolla_build_blocks:
                -e '/\[{{ repo.tag }}\]/,/^\[/ s/^[# ]*\(metalink *=.*\)/#\1/g' \
                -e '/\[{{ repo.tag }}\]/,/^\[/ s|^\(name.*\)|\1\nbaseurl={{ repo.url }}|' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \
     {% endfor %}
+        # NOTE(bbezak): RDO epoxy repo obsoletes many OVN versions
+        # (see rdo-openvswitch.spec obsolete_ovn_versions:
+        # https://git.centos.org/rpms/rdo-openvswitch/blob/c9s-sig-cloud-openstack-epoxy/f/SPECS/rdo-openvswitch.spec#L10),
+        # which would replace our NFV OVS and OVN 24.03 LTS with 24.09. Hence exclude RDO OVN/OVS.
+        && \
+        sed -i '/^\[centos-openstack-epoxy\]/a excludepkgs=*rdo-ovn*,*rdo-openvswitch*' /etc/yum.repos.d/CentOS-OpenStack-epoxy.repo \
     {% endif %}
   # With the UCA keyring installed we can now add all repos.
   base_ubuntu_package_sources_list: |

etc/kayobe/pulp-repo-versions.yml

@@ -4,6 +4,7 @@
 stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version: 20250627T134211
 stackhpc_pulp_repo_centos_stream_9_docker_version: 20250531T002004
 stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20250528T022338
+stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version: 20250521T021940
 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
 stackhpc_pulp_repo_centos_stream_9_storage_ceph_squid_version: 20250412T024303
 stackhpc_pulp_repo_doca_2_9_1_rhel9_4_version: 20241211T153620
@@ -53,7 +54,7 @@ stackhpc_pulp_repo_rocky_9_5_highavailability_version: 20250204T095037
 stackhpc_pulp_repo_rocky_9_6_appstream_version: 20250614T015933
 stackhpc_pulp_repo_rocky_9_6_baseos_version: 20250614T030644
 stackhpc_pulp_repo_rocky_9_6_crb_version: 20250614T015933
-stackhpc_pulp_repo_rocky_9_6_extras_version: 20250605T150141
+stackhpc_pulp_repo_rocky_9_6_extras_version: 20250726T040613
 stackhpc_pulp_repo_rocky_9_6_highavailability_version: 20250605T150141
 stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20250222T040303
 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20250620T063939

etc/kayobe/pulp.yml

@@ -289,6 +289,12 @@ stackhpc_pulp_rpm_repos:
     base_path: "centos/9-stream/nfv/x86_64/openvswitch-2/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
 
+  - name: CentOS Stream 9 - OpenStack Epoxy
+    url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-epoxy/{{ stackhpc_pulp_repo_centos_stream_9_openstack_epoxy_version }}"
+    distribution_name: "centos-stream-9-openstack-epoxy-"
+    base_path: "centos/9-stream/cloud/x86_64/openstack-epoxy/"
+    required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}"
+
   - name: CentOS 9 - OpsTools - collectd
     url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/opstools/x86_64/collectd-5/{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}"
     distribution_name: "centos-9-opstools-collectd-"

etc/kayobe/stackhpc.yml

@@ -72,6 +72,10 @@ stackhpc_repo_rhel9_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_repo_centos_stream_9_nfv_openvswitch_version }}"
 stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}"
 
+# CentOS Stream 9 - OpenStack Epoxy
+stackhpc_repo_centos_stream_9_openstack_epoxy_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/cloud/x86_64/openstack-epoxy/{{ stackhpc_repo_centos_stream_9_openstack_epoxy_version }}"
+stackhpc_repo_centos_stream_9_openstack_epoxy_version: "{{ stackhpc_repo_distribution }}"
+
 # CentOS Stream 9 - OpsTools - collectd
 stackhpc_repo_centos_stream_9_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/9-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_9_opstools_version }}"
 stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_repo_distribution }}"
@@ -145,11 +149,11 @@ stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}"
 
 # Kolla source repository.
 stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla"
-stackhpc_kolla_source_version: stackhpc/20.1.0.4
+stackhpc_kolla_source_version: stackhpc/20.1.0.6
 
 # Kolla Ansible source repository.
 stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible"
-stackhpc_kolla_ansible_source_version: stackhpc/20.1.0.4
+stackhpc_kolla_ansible_source_version: stackhpc/20.1.0.5
 
 ###############################################################################
 # Container image registry