From b217e431d1656c3d74126d12aa6148d6ee3f34fa Mon Sep 17 00:00:00 2001 From: Alex-Welsh Date: Tue, 12 Sep 2023 13:25:21 +0100 Subject: [PATCH] Update package config for Antelope --- etc/kayobe/environments/ci-aio/stackhpc-ci.yml | 2 +- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 2 +- etc/kayobe/environments/ci-multinode/stackhpc-ci.yml | 2 +- etc/kayobe/kolla.yml | 7 ++++--- etc/kayobe/pulp-repo-versions.yml | 2 +- etc/kayobe/pulp.yml | 8 ++++---- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml index ec5a82578..fb5850056 100644 --- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml @@ -28,7 +28,7 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}" stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}" stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}" -stackhpc_repo_centos_stream_9_openstack_zed_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_zed_version }}" +stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}" stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}" stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}" stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}" diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index d64d24c00..5ed45e550 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -51,7 +51,7 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}" stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}" stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}" -stackhpc_repo_centos_stream_9_openstack_zed_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_zed_version }}" +stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}" stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}" stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}" stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}" diff --git a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml index 29bf9fe88..f312ed479 100644 --- a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml @@ -28,7 +28,7 @@ stackhpc_repo_ubuntu_jammy_security_version: "{{ stackhpc_pulp_repo_ubuntu_jammy stackhpc_repo_ubuntu_cloud_archive_version: "{{ stackhpc_pulp_repo_ubuntu_cloud_archive_version }}" stackhpc_repo_docker_ce_ubuntu_version: "{{ stackhpc_pulp_repo_docker_ce_ubuntu_version }}" stackhpc_repo_centos_stream_9_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version }}" -stackhpc_repo_centos_stream_9_openstack_zed_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_zed_version }}" +stackhpc_repo_centos_stream_9_openstack_antelope_version: "{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}" stackhpc_repo_centos_stream_9_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_9_opstools_version }}" stackhpc_repo_centos_stream_9_storage_ceph_quincy_version: "{{ stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version }}" stackhpc_repo_centos_stream_9_docker_version: "{{ stackhpc_pulp_repo_centos_stream_9_docker_version }}" diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 84aedd476..e5c229512 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -136,6 +136,7 @@ kolla_sources: type: git location: https://github.com/stackhpc/stackhpc-inspector-plugins.git reference: 1.3.0 + # Not yet merged: https://github.com/stackhpc/magnum/pull/139 magnum-base: type: git location: https://github.com/stackhpc/magnum.git @@ -165,9 +166,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_zed_url }}" - file: "CentOS-OpenStack-zed.repo" - tag: "centos-openstack-zed" + - url: "{{ stackhpc_repo_centos_stream_9_openstack_antelope_url }}" + file: "CentOS-OpenStack-antelope.repo" + tag: "centos-openstack-antelope" - url: "{{ stackhpc_repo_centos_stream_9_opstools_url }}" file: "CentOS-OpsTools.repo" tag: "centos-opstools" diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 700b7be79..bc839d860 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -2,7 +2,7 @@ # Do not edit! This file is autogenerated by Ansible. stackhpc_pulp_repo_centos_stream_9_docker_version: 20230228T044432 stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20230510T072502 -stackhpc_pulp_repo_centos_stream_9_openstack_zed_version: 20230721T005746 +stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version: 20230912T101324 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230301T034123 stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version: 20230712T025152 stackhpc_pulp_repo_epel_9_version: 20230302T031902 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index d20038ed4..19d738751 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -280,10 +280,10 @@ stackhpc_pulp_rpm_repos: required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}" - - name: CentOS Stream 9 - OpenStack Zed - url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-zed/{{ stackhpc_pulp_repo_centos_stream_9_openstack_zed_version }}" - distribution_name: "centos-stream-9-openstack-zed-" - base_path: "centos/9-stream/cloud/x86_64/openstack-zed/" + - name: CentOS Stream 9 - OpenStack Antelope + url: "{{ stackhpc_release_pulp_content_url }}/centos/9-stream/cloud/x86_64/openstack-antelope/{{ stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version }}" + distribution_name: "centos-stream-9-openstack-antelope-" + base_path: "centos/9-stream/cloud/x86_64/openstack-antelope/" required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}" - name: CentOS 9 - OpsTools - collectd