From fb75186a2b83d78c6c5737b630e20f0809f45280 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Thu, 7 Dec 2023 16:46:26 +0000 Subject: [PATCH 01/20] Update pulp repo versions from gh action artifact Update pulp repository versions from gh action "Update Kayobe package repository versions" artifact `pulp-repo-versions.yml` --- etc/kayobe/pulp-repo-versions.yml | 76 +++++++++++++++---------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 725629de5..a7683c315 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -1,36 +1,36 @@ --- # Do not edit! This file is autogenerated by Ansible. stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_appstream_version: 20231018T041416 -stackhpc_pulp_repo_centos_stream_8_baseos_version: 20231018T041416 +stackhpc_pulp_repo_centos_stream_8_appstream_version: 20231130T012511 +stackhpc_pulp_repo_centos_stream_8_baseos_version: 20231130T012511 stackhpc_pulp_repo_centos_stream_8_extras_common_version: 20230906T030027 stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901 stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: 20230308T103119 -stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20230929T005202 -stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20231011T133933 +stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20231130T012511 +stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20231125T011517 stackhpc_pulp_repo_centos_stream_8_opstools_version: 20230615T071742 -stackhpc_pulp_repo_centos_stream_8_powertools_version: 20231018T041416 -stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20230709T010022 -stackhpc_pulp_repo_centos_stream_9_docker_version: 20230919T015626 -stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20230929T005202 -stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20231005T010906 +stackhpc_pulp_repo_centos_stream_8_powertools_version: 20231130T012511 +stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20231027T005344 +stackhpc_pulp_repo_centos_stream_9_docker_version: 20231123T014958 +stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20231130T012511 +stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20231115T032622 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230615T071742 -stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20230709T010022 -stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231020T014922 -stackhpc_pulp_repo_docker_version: 20230919T015626 -stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20231012T003815 +stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20231027T005344 +stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231207T013715 +stackhpc_pulp_repo_docker_version: 20231123T014958 +stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20231115T032622 stackhpc_pulp_repo_elrepo_9_version: 20230907T075311 -stackhpc_pulp_repo_epel_9_version: 20231020T014922 +stackhpc_pulp_repo_epel_9_version: 20231207T013715 stackhpc_pulp_repo_epel_modular_version: 20220913T043117 -stackhpc_pulp_repo_epel_version: 20231020T014922 -stackhpc_pulp_repo_grafana_version: 20231020T014922 -stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20230815T010124 +stackhpc_pulp_repo_epel_version: 20231207T013715 +stackhpc_pulp_repo_grafana_version: 20231207T013715 +stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20231115T032622 stackhpc_pulp_repo_mlnx_ofed_5_7_1_0_2_0_rhel8_6_version: 20220920T151419 stackhpc_pulp_repo_rabbitmq_erlang_version: 20231015T004919 -stackhpc_pulp_repo_rabbitmq_server_version: 20231018T041416 -stackhpc_pulp_repo_rhel_9_influxdb_version: 20231019T010143 -stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20230815T010124 -stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20230903T003752 +stackhpc_pulp_repo_rabbitmq_server_version: 20231123T014958 +stackhpc_pulp_repo_rhel_9_influxdb_version: 20231117T003714 +stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20231115T032622 +stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511 stackhpc_pulp_repo_rocky_8_6_appstream_version: 20221105T035018 stackhpc_pulp_repo_rocky_8_6_baseos_version: 20221105T035018 stackhpc_pulp_repo_rocky_8_6_extras_version: 20221105T035018 @@ -41,24 +41,24 @@ stackhpc_pulp_repo_rocky_8_7_baseos_version: 20230506T071747 stackhpc_pulp_repo_rocky_8_7_extras_version: 20230506T071747 stackhpc_pulp_repo_rocky_8_7_nfv_version: 20230505T080038 stackhpc_pulp_repo_rocky_8_7_powertools_version: 20230505T080038 -stackhpc_pulp_repo_rocky_8_8_appstream_version: 20231020T014922 -stackhpc_pulp_repo_rocky_8_8_baseos_version: 20231020T014922 -stackhpc_pulp_repo_rocky_8_8_extras_version: 20231012T003815 -stackhpc_pulp_repo_rocky_8_8_nfv_version: 20231018T041416 -stackhpc_pulp_repo_rocky_8_8_powertools_version: 20231019T010143 -stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231012T003815 -stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_1_crb_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_1_extras_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231018T041416 -stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_2_crb_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_2_extras_version: 20231001T002904 -stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20230918T015928 -stackhpc_pulp_repo_treasuredata_4_version: 20230903T003752 +stackhpc_pulp_repo_rocky_8_8_appstream_version: 20231207T013715 +stackhpc_pulp_repo_rocky_8_8_baseos_version: 20231207T013715 +stackhpc_pulp_repo_rocky_8_8_extras_version: 20231207T013715 +stackhpc_pulp_repo_rocky_8_8_nfv_version: 20231207T013715 +stackhpc_pulp_repo_rocky_8_8_powertools_version: 20231207T013715 +stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715 +stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015 +stackhpc_pulp_repo_rocky_9_1_crb_version: 20231206T014015 +stackhpc_pulp_repo_rocky_9_1_extras_version: 20231203T011400 +stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231207T013715 +stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231206T014015 +stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231207T013715 +stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715 +stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715 +stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231207T013715 +stackhpc_pulp_repo_treasuredata_4_version: 20231130T012511 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502 stackhpc_pulp_repo_ubuntu_focal_security_version: 20231018T165217 stackhpc_pulp_repo_ubuntu_focal_version: 20231018T165217 stackhpc_pulp_repo_ubuntu_jammy_security_version: 20231020T074329 -stackhpc_pulp_repo_ubuntu_jammy_version: 20231020T074329 +stackhpc_pulp_repo_ubuntu_jammy_version: 20231020T074329 \ No newline at end of file From ef97f47816c33209d734e7059146df3ef5239b64 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 8 Dec 2023 10:47:47 +0000 Subject: [PATCH 02/20] Add new line at the end of file because Tox unhappy --- etc/kayobe/pulp-repo-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index a7683c315..3f1f2bca6 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -61,4 +61,4 @@ stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502 stackhpc_pulp_repo_ubuntu_focal_security_version: 20231018T165217 stackhpc_pulp_repo_ubuntu_focal_version: 20231018T165217 stackhpc_pulp_repo_ubuntu_jammy_security_version: 20231020T074329 -stackhpc_pulp_repo_ubuntu_jammy_version: 20231020T074329 \ No newline at end of file +stackhpc_pulp_repo_ubuntu_jammy_version: 20231020T074329 From 05b603a71ded2dd960772ae97ec1fcfc749061c5 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Mon, 11 Dec 2023 10:27:13 +0000 Subject: [PATCH 03/20] Update default stackhpc pulp repo rocky version to 9.3 --- etc/kayobe/pulp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 9e8af49ca..41e15b3ec 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -232,8 +232,8 @@ stackhpc_pulp_sync_el_8: "{{ stackhpc_pulp_sync_rocky_8 or stackhpc_pulp_sync_ce # Whether to sync Rocky Linux 9 packages. stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' and os_release == '9' }}" -# Rocky 9 minor version number. Supported values: 1, 2. Default is 2 -stackhpc_pulp_repo_rocky_9_minor_version: 2 +# Rocky 9 minor version number. Supported values: 1, 2, 3. Default is 3 +stackhpc_pulp_repo_rocky_9_minor_version: 3 # Rocky 9 Snapshot versions. The defaults use the appropriate version from # pulp-repo-versions.yml for the selected minor release. stackhpc_pulp_repo_rocky_9_appstream_version: "{{ lookup('vars', 'stackhpc_pulp_repo_rocky_9_%s_appstream_version' % stackhpc_pulp_repo_rocky_9_minor_version) }}" From 64f0284b9a3f0dafe6569e0bd66c12486d2b2fe4 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Mon, 11 Dec 2023 15:10:37 +0000 Subject: [PATCH 04/20] Revert unnecessary updates and update RL 9.2 and 9.3 repos --- etc/kayobe/pulp-repo-versions.yml | 75 ++++++++++++++++--------------- 1 file changed, 40 insertions(+), 35 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 3f1f2bca6..00f43fe3b 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -1,36 +1,36 @@ --- # Do not edit! This file is autogenerated by Ansible. stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_appstream_version: 20231130T012511 -stackhpc_pulp_repo_centos_stream_8_baseos_version: 20231130T012511 +stackhpc_pulp_repo_centos_stream_8_appstream_version: 20231018T041416 +stackhpc_pulp_repo_centos_stream_8_baseos_version: 20231018T041416 stackhpc_pulp_repo_centos_stream_8_extras_common_version: 20230906T030027 stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901 stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: 20230308T103119 -stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20231130T012511 -stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20231125T011517 +stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20230929T005202 +stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20231011T133933 stackhpc_pulp_repo_centos_stream_8_opstools_version: 20230615T071742 -stackhpc_pulp_repo_centos_stream_8_powertools_version: 20231130T012511 -stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20231027T005344 -stackhpc_pulp_repo_centos_stream_9_docker_version: 20231123T014958 -stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20231130T012511 -stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20231115T032622 +stackhpc_pulp_repo_centos_stream_8_powertools_version: 20231018T041416 +stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20230709T010022 +stackhpc_pulp_repo_centos_stream_9_docker_version: 20230919T015626 +stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20230929T005202 +stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20231005T010906 stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230615T071742 -stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20231027T005344 -stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231207T013715 -stackhpc_pulp_repo_docker_version: 20231123T014958 -stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20231115T032622 +stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20230709T010022 +stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231020T014922 +stackhpc_pulp_repo_docker_version: 20230919T015626 +stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20231012T003815 stackhpc_pulp_repo_elrepo_9_version: 20230907T075311 -stackhpc_pulp_repo_epel_9_version: 20231207T013715 +stackhpc_pulp_repo_epel_9_version: 20231020T014922 stackhpc_pulp_repo_epel_modular_version: 20220913T043117 -stackhpc_pulp_repo_epel_version: 20231207T013715 -stackhpc_pulp_repo_grafana_version: 20231207T013715 -stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20231115T032622 +stackhpc_pulp_repo_epel_version: 20231020T014922 +stackhpc_pulp_repo_grafana_version: 20231020T014922 +stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20230815T010124 stackhpc_pulp_repo_mlnx_ofed_5_7_1_0_2_0_rhel8_6_version: 20220920T151419 stackhpc_pulp_repo_rabbitmq_erlang_version: 20231015T004919 -stackhpc_pulp_repo_rabbitmq_server_version: 20231123T014958 -stackhpc_pulp_repo_rhel_9_influxdb_version: 20231117T003714 -stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20231115T032622 -stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511 +stackhpc_pulp_repo_rabbitmq_server_version: 20231018T041416 +stackhpc_pulp_repo_rhel_9_influxdb_version: 20231019T010143 +stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20230815T010124 +stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20230903T003752 stackhpc_pulp_repo_rocky_8_6_appstream_version: 20221105T035018 stackhpc_pulp_repo_rocky_8_6_baseos_version: 20221105T035018 stackhpc_pulp_repo_rocky_8_6_extras_version: 20221105T035018 @@ -41,22 +41,27 @@ stackhpc_pulp_repo_rocky_8_7_baseos_version: 20230506T071747 stackhpc_pulp_repo_rocky_8_7_extras_version: 20230506T071747 stackhpc_pulp_repo_rocky_8_7_nfv_version: 20230505T080038 stackhpc_pulp_repo_rocky_8_7_powertools_version: 20230505T080038 -stackhpc_pulp_repo_rocky_8_8_appstream_version: 20231207T013715 -stackhpc_pulp_repo_rocky_8_8_baseos_version: 20231207T013715 -stackhpc_pulp_repo_rocky_8_8_extras_version: 20231207T013715 -stackhpc_pulp_repo_rocky_8_8_nfv_version: 20231207T013715 -stackhpc_pulp_repo_rocky_8_8_powertools_version: 20231207T013715 -stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715 -stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015 -stackhpc_pulp_repo_rocky_9_1_crb_version: 20231206T014015 -stackhpc_pulp_repo_rocky_9_1_extras_version: 20231203T011400 -stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231207T013715 -stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231206T014015 -stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231207T013715 +stackhpc_pulp_repo_rocky_8_8_appstream_version: 20231020T014922 +stackhpc_pulp_repo_rocky_8_8_baseos_version: 20231020T014922 +stackhpc_pulp_repo_rocky_8_8_extras_version: 20231012T003815 +stackhpc_pulp_repo_rocky_8_8_nfv_version: 20231018T041416 +stackhpc_pulp_repo_rocky_8_8_powertools_version: 20231019T010143 +stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231012T003815 +stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231020T014922 +stackhpc_pulp_repo_rocky_9_1_crb_version: 20231020T014922 +stackhpc_pulp_repo_rocky_9_1_extras_version: 20231020T014922 +stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231020T014922 +stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328 stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715 stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715 -stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231207T013715 -stackhpc_pulp_repo_treasuredata_4_version: 20231130T012511 +stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231208T011702 +stackhpc_pulp_repo_rocky_9_3_appstream_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_3_baseos_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_3_crb_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_3_extras_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20231211T120328 +stackhpc_pulp_repo_treasuredata_4_version: 20230903T003752 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502 stackhpc_pulp_repo_ubuntu_focal_security_version: 20231018T165217 stackhpc_pulp_repo_ubuntu_focal_version: 20231018T165217 From a2f84ad25a7a6e1b8c62d08904800a016b2db0fb Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 12 Dec 2023 15:01:35 +0000 Subject: [PATCH 05/20] Update Kolla container image tags to RL 9.3 --- etc/kayobe/kolla/globals.yml | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 337687d65..2f678c103 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -13,16 +13,24 @@ kolla_base_distro: "{% raw %}{{ 'centos' if ansible_facts.distribution == 'Rocky kayobe_image_tags: openstack: centos: yoga-20231024T093507 - rocky: yoga-20231024T093507 + rocky: yoga-20231211T151419 ubuntu: yoga-20231024T093507 nova: centos: yoga-20231113T171023 - rocky: yoga-20231103T161400 + rocky: yoga-20231211T151419 ubuntu: yoga-20231103T161400 - -cloudkitty_tag: yoga-20231107T165648 + cloudkitty: + centos: yoga-20231107T165648 + rocky: yoga-20231211T151419 + ubuntu: yoga-20231107T165648 + neutron: + centos: yoga-20231114T125927 + rocky: yoga-20231211T151419 + ubuntu: yoga-20231114T125927 + +cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}" nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}" -neutron_tag: yoga-20231114T125927 +neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] }}{% endraw %}" # These overrides are currently redundant, but are kept because it's not obvious that you need them if setting haproxy_tag glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" From 250c9cb5cebd5c7cd7e03eb4eb285d6cd11f4056 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Mon, 18 Dec 2023 13:49:39 +0000 Subject: [PATCH 06/20] Update pulp repo to include RL kernel-5.14.0-362.13.1.el9_3.x86_64 --- etc/kayobe/pulp-repo-versions.yml | 76 +++++++++++++++---------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 00f43fe3b..2887004b9 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -1,36 +1,36 @@ --- # Do not edit! This file is autogenerated by Ansible. stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_appstream_version: 20231018T041416 -stackhpc_pulp_repo_centos_stream_8_baseos_version: 20231018T041416 +stackhpc_pulp_repo_centos_stream_8_appstream_version: 20231213T031318 +stackhpc_pulp_repo_centos_stream_8_baseos_version: 20231213T031318 stackhpc_pulp_repo_centos_stream_8_extras_common_version: 20230906T030027 stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901 stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: 20230308T103119 -stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20230929T005202 -stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20231011T133933 +stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20231130T012511 +stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20231125T011517 stackhpc_pulp_repo_centos_stream_8_opstools_version: 20230615T071742 -stackhpc_pulp_repo_centos_stream_8_powertools_version: 20231018T041416 -stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20230709T010022 -stackhpc_pulp_repo_centos_stream_9_docker_version: 20230919T015626 -stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20230929T005202 -stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20231005T010906 -stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230615T071742 -stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20230709T010022 -stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231020T014922 -stackhpc_pulp_repo_docker_version: 20230919T015626 -stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20231012T003815 +stackhpc_pulp_repo_centos_stream_8_powertools_version: 20231213T031318 +stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20231027T005344 +stackhpc_pulp_repo_centos_stream_9_docker_version: 20231211T120328 +stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20231130T012511 +stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20231115T032622 +stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318 +stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20231027T005344 +stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231218T002857 +stackhpc_pulp_repo_docker_version: 20231211T120328 +stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20231115T032622 stackhpc_pulp_repo_elrepo_9_version: 20230907T075311 -stackhpc_pulp_repo_epel_9_version: 20231020T014922 +stackhpc_pulp_repo_epel_9_version: 20231218T002857 stackhpc_pulp_repo_epel_modular_version: 20220913T043117 -stackhpc_pulp_repo_epel_version: 20231020T014922 -stackhpc_pulp_repo_grafana_version: 20231020T014922 -stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20230815T010124 +stackhpc_pulp_repo_epel_version: 20231218T002857 +stackhpc_pulp_repo_grafana_version: 20231217T003113 +stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20231115T032622 stackhpc_pulp_repo_mlnx_ofed_5_7_1_0_2_0_rhel8_6_version: 20220920T151419 -stackhpc_pulp_repo_rabbitmq_erlang_version: 20231015T004919 -stackhpc_pulp_repo_rabbitmq_server_version: 20231018T041416 -stackhpc_pulp_repo_rhel_9_influxdb_version: 20231019T010143 -stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20230815T010124 -stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20230903T003752 +stackhpc_pulp_repo_rabbitmq_erlang_version: 20231214T005538 +stackhpc_pulp_repo_rabbitmq_server_version: 20231214T005538 +stackhpc_pulp_repo_rhel_9_influxdb_version: 20231215T005810 +stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20231115T032622 +stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511 stackhpc_pulp_repo_rocky_8_6_appstream_version: 20221105T035018 stackhpc_pulp_repo_rocky_8_6_baseos_version: 20221105T035018 stackhpc_pulp_repo_rocky_8_6_extras_version: 20221105T035018 @@ -41,27 +41,27 @@ stackhpc_pulp_repo_rocky_8_7_baseos_version: 20230506T071747 stackhpc_pulp_repo_rocky_8_7_extras_version: 20230506T071747 stackhpc_pulp_repo_rocky_8_7_nfv_version: 20230505T080038 stackhpc_pulp_repo_rocky_8_7_powertools_version: 20230505T080038 -stackhpc_pulp_repo_rocky_8_8_appstream_version: 20231020T014922 -stackhpc_pulp_repo_rocky_8_8_baseos_version: 20231020T014922 -stackhpc_pulp_repo_rocky_8_8_extras_version: 20231012T003815 -stackhpc_pulp_repo_rocky_8_8_nfv_version: 20231018T041416 -stackhpc_pulp_repo_rocky_8_8_powertools_version: 20231019T010143 -stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231012T003815 -stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_1_crb_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_1_extras_version: 20231020T014922 -stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231020T014922 +stackhpc_pulp_repo_rocky_8_8_appstream_version: 20231211T120328 +stackhpc_pulp_repo_rocky_8_8_baseos_version: 20231211T120328 +stackhpc_pulp_repo_rocky_8_8_extras_version: 20231211T120328 +stackhpc_pulp_repo_rocky_8_8_nfv_version: 20231211T120328 +stackhpc_pulp_repo_rocky_8_8_powertools_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715 +stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015 +stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_1_extras_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231208T011702 stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231211T120328 stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328 stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715 stackhpc_pulp_repo_rocky_9_2_extras_version: 20231207T013715 stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20231208T011702 -stackhpc_pulp_repo_rocky_9_3_appstream_version: 20231211T120328 -stackhpc_pulp_repo_rocky_9_3_baseos_version: 20231211T120328 -stackhpc_pulp_repo_rocky_9_3_crb_version: 20231211T120328 +stackhpc_pulp_repo_rocky_9_3_appstream_version: 20231215T005810 +stackhpc_pulp_repo_rocky_9_3_baseos_version: 20231215T005810 +stackhpc_pulp_repo_rocky_9_3_crb_version: 20231215T005810 stackhpc_pulp_repo_rocky_9_3_extras_version: 20231211T120328 -stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20231211T120328 -stackhpc_pulp_repo_treasuredata_4_version: 20230903T003752 +stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20231214T005538 +stackhpc_pulp_repo_treasuredata_4_version: 20231130T012511 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502 stackhpc_pulp_repo_ubuntu_focal_security_version: 20231018T165217 stackhpc_pulp_repo_ubuntu_focal_version: 20231018T165217 From 3b30a86592f5096b6171a9d6fcda9acb637494b7 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 9 Jan 2024 12:42:10 +0000 Subject: [PATCH 07/20] Fix Rocky Linux 9 targeting Cephadm Pacific The upstream Cephadm Pacific repository is no more available and this change prevents targeting the repository when building Rocky Linux 9 environment --- etc/kayobe/cephadm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/cephadm.yml b/etc/kayobe/cephadm.yml index 0e0b2fceb..dd30ccd74 100644 --- a/etc/kayobe/cephadm.yml +++ b/etc/kayobe/cephadm.yml @@ -3,7 +3,7 @@ # Cephadm deployment configuration. # Ceph release name. -cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == 'jammy') else 'pacific' }}" +cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == 'jammy') or (ansible_facts['distribution_release'] == '9') else 'pacific' }}" # Ceph FSID. #cephadm_fsid: @@ -12,7 +12,7 @@ cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}" # Ceph container image tag. -cephadm_image_tag: "{{ 'v17.2.7' if os_release == 'jammy' else 'v16.2.14' }}" +cephadm_image_tag: "{{ 'v17.2.7' if (os_release == 'jammy') or (os_release == '9') else 'v16.2.14' }}" # Ceph custom repo workaround for Ubuntu Jammy as there are no official ceph repos for jammy. cephadm_custom_repos: "{{ ansible_facts['distribution_release'] == 'jammy' }}" From 6ffa526fa9bf3e1d80ac0ca42f04d29d9e1f6d00 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 9 Jan 2024 12:46:16 +0000 Subject: [PATCH 08/20] Enable installing Elrepo9 for Rocky Linux 9.3 upgrade --- etc/kayobe/dnf.yml | 2 +- .../ci-multinode/inventory/group_vars/seed/stackhpc-dnf-repos | 3 +++ etc/kayobe/stackhpc.yml | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/stackhpc-dnf-repos diff --git a/etc/kayobe/dnf.yml b/etc/kayobe/dnf.yml index b060c478f..a506e6740 100644 --- a/etc/kayobe/dnf.yml +++ b/etc/kayobe/dnf.yml @@ -200,7 +200,7 @@ rocky_9_gpg_key: "https://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9" # Whether to create a repo file for ELRepo. This affects RedHat-based # systems only. -dnf_install_elrepo_9: false +dnf_install_elrepo_9: true # Whether to enable docker dnf repo in stackhpc_dnf_repos dnf_enable_docker: true diff --git a/etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/stackhpc-dnf-repos b/etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/stackhpc-dnf-repos new file mode 100644 index 000000000..df8258662 --- /dev/null +++ b/etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/stackhpc-dnf-repos @@ -0,0 +1,3 @@ +--- +# To ensure seed can install packages during `kayobe seed host configure` +dnf_custom_repos: "{{ stackhpc_dnf_repos }}" diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index 0ca77eb82..ea859d361 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -191,7 +191,7 @@ stackhpc_repo_epel_9_version: "{{ stackhpc_repo_distribution }}" # ELRepo 9 stackhpc_repo_elrepo_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/elrepo/elrepo/el9/x86_64/{{ stackhpc_repo_elrepo_9_version }}" -stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}" +stackhpc_repo_elrepo_9_version: "20230907T075311" ############################################################################### # Sources From b59b4d71edaccab30106508ab98ae6d91fa38b2e Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 9 Jan 2024 12:50:00 +0000 Subject: [PATCH 09/20] Update Kolla container tags to apply pyroute2 compatibility fix --- etc/kayobe/kolla/globals.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 2f678c103..2b2738ea5 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -13,19 +13,19 @@ kolla_base_distro: "{% raw %}{{ 'centos' if ansible_facts.distribution == 'Rocky kayobe_image_tags: openstack: centos: yoga-20231024T093507 - rocky: yoga-20231211T151419 + rocky: yoga-20231218T141822 ubuntu: yoga-20231024T093507 nova: centos: yoga-20231113T171023 - rocky: yoga-20231211T151419 + rocky: yoga-20240105T120257 ubuntu: yoga-20231103T161400 cloudkitty: centos: yoga-20231107T165648 - rocky: yoga-20231211T151419 + rocky: yoga-20231218T141822 ubuntu: yoga-20231107T165648 neutron: centos: yoga-20231114T125927 - rocky: yoga-20231211T151419 + rocky: yoga-20240105T120257 ubuntu: yoga-20231114T125927 cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}" From 3f92251cbb740ca1027b0cc9c7fc157e1858ea99 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Thu, 7 Dec 2023 16:50:47 +0000 Subject: [PATCH 10/20] Fix Wazuh manager playbook with no custom policies --- etc/kayobe/ansible/wazuh-manager.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/ansible/wazuh-manager.yml b/etc/kayobe/ansible/wazuh-manager.yml index fedd1ad93..6865d3b6f 100644 --- a/etc/kayobe/ansible/wazuh-manager.yml +++ b/etc/kayobe/ansible/wazuh-manager.yml @@ -41,7 +41,9 @@ dest: "/var/ossec/etc/shared/default/" owner: wazuh group: wazuh - when: custom_sca_policies.files | length > 0 + when: + - custom_sca_policies_folder.stat.exists + - custom_sca_policies.files | length > 0 - name: Add custom policy definition(s) to the shared Agent config blockinfile: @@ -61,7 +63,9 @@ {% endfilter %} - when: custom_sca_policies.files | length > 0 + when: + - custom_sca_policies_folder.stat.exists + - custom_sca_policies.files | length > 0 notify: - Restart wazuh From bc2bcb764748c7364e0aa01a3dde065036d050ba Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 20 Dec 2023 09:24:54 +0000 Subject: [PATCH 11/20] Merge pull request #844 from stackhpc/yoga-opensearch-pin use ark repos for R9 opensearch builds --- etc/kayobe/environments/ci-builder/stackhpc-ci.yml | 2 ++ etc/kayobe/kolla.yml | 6 ++++++ etc/kayobe/kolla/globals.yml | 1 + etc/kayobe/pulp-repo-versions.yml | 2 ++ etc/kayobe/pulp.yml | 12 ++++++++++++ etc/kayobe/stackhpc.yml | 8 ++++++++ 6 files changed, 31 insertions(+) diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 79ea4a7f8..efe4236e9 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -80,6 +80,8 @@ stackhpc_repo_rhel_9_treasuredata_4_version: "{{ stackhpc_pulp_repo_rhel_9_treas stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_pulp_repo_rhel_9_mariadb_10_6_version }}" stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_version }}" stackhpc_repo_epel_9_version: "{{ stackhpc_pulp_repo_epel_9_version }}" +stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_pulp_repo_opensearch_2_x_version }}" +stackhpc_repo_opensearch_dashboards_2_x_version: "{{ stackhpc_pulp_repo_opensearch_dashboards_2_x_version }}" ## Use derived vars from etc/kayobe/pulp.yml to switch between ## minor Rocky versions using stackhpc_pulp_repo_rocky_x_minor_version stackhpc_repo_rocky_baseos_version: "{{ stackhpc_pulp_repo_rocky_8_baseos_version }}" diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 1f975c609..082e9243b 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -268,6 +268,12 @@ stackhpc_rocky_9_third_party_repos: - url: "{{ stackhpc_repo_rabbitmq_server_url }}" file: "rabbitmq_rabbitmq-server.repo" tag: "rabbitmq_rabbitmq-server" + - url: "{{ stackhpc_repo_opensearch_2_x_url }}" + file: "opensearch.repo" + tag: "opensearch-2.x" + - url: "{{ stackhpc_repo_opensearch_dashboards_2_x_url }}" + file: "opensearch.repo" + tag: "opensearch-dashboards-2.x" # List of EPEL 9 stackhpc_epel_9_repos: diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 2b2738ea5..a46f135bd 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -31,6 +31,7 @@ kayobe_image_tags: cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}" nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}" neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] }}{% endraw %}" +opensearch_tag: yoga-20231219T221916 # These overrides are currently redundant, but are kept because it's not obvious that you need them if setting haproxy_tag glance_tls_proxy_tag: "{% raw %}{{ haproxy_tag | default(openstack_tag) }}{% endraw %}" diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index 2887004b9..f4ac537e5 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -26,6 +26,8 @@ stackhpc_pulp_repo_epel_version: 20231218T002857 stackhpc_pulp_repo_grafana_version: 20231217T003113 stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20231115T032622 stackhpc_pulp_repo_mlnx_ofed_5_7_1_0_2_0_rhel8_6_version: 20220920T151419 +stackhpc_pulp_repo_opensearch_2_x_version: 20231202T013234 +stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20231202T013234 stackhpc_pulp_repo_rabbitmq_erlang_version: 20231214T005538 stackhpc_pulp_repo_rabbitmq_server_version: 20231214T005538 stackhpc_pulp_repo_rhel_9_influxdb_version: 20231215T005810 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 41e15b3ec..3e268a662 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -500,6 +500,18 @@ stackhpc_pulp_rpm_repos: base_path: "influxdb/rhel/9/x86_64/stable/" required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}" + - name: OpenSearch 2.x + url: "{{ stackhpc_release_pulp_content_url }}/opensearch/2.x/yum/{{ stackhpc_pulp_repo_opensearch_2_x_version }}" + distribution_name: "opensearch-2-x-" + base_path: "opensearch/2.x/yum/" + required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}" + + - name: OpenSearch Dashboards 2.x + url: "{{ stackhpc_release_pulp_content_url }}/opensearch-dashboards/2.x/yum/{{ stackhpc_pulp_repo_opensearch_dashboards_2_x_version }}" + distribution_name: "opensearch-dashboards-2-x-" + base_path: "opensearch-dashboards/2.x/yum/" + required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_9 | bool }}" + # RPM repositories stackhpc_pulp_repository_rpm_repos: >- {%- set rpm_repos = [] -%} diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index ea859d361..a99ae81ad 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -165,6 +165,14 @@ stackhpc_repo_rhel_9_mariadb_10_6_version: "{{ stackhpc_repo_distribution }}" stackhpc_repo_rhel_9_influxdb_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/influxdb/rhel/9/x86_64/stable/{{ stackhpc_repo_rhel_9_influxdb_version }}" stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_repo_distribution }}" +# OpenSearch for RHEL 9 +stackhpc_repo_opensearch_2_x_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/opensearch/2.x/yum/{{ stackhpc_repo_opensearch_2_x_version }}" +stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_repo_distribution }}" + +# OpenSearch Dashboards for RHEL 9 +stackhpc_repo_opensearch_dashboards_2_x_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/opensearch-dashboards/2.x/yum/{{ stackhpc_repo_opensearch_dashboards_2_x_version }}" +stackhpc_repo_opensearch_dashboards_2_x_version: "{{ stackhpc_repo_distribution }}" + # Rocky 9 AppStream stackhpc_repo_rocky_9_appstream_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rocky/{{ stackhpc_rocky_9_url_version }}/AppStream/x86_64/os/{{ stackhpc_repo_rocky_9_appstream_version }}" stackhpc_repo_rocky_9_appstream_version: "{{ stackhpc_repo_distribution }}" From 0d9c4185f7b73bd1b4e5923cc1b2bf1aff6f06a6 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Tue, 9 Jan 2024 15:34:21 +0000 Subject: [PATCH 12/20] Add releasenote --- releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml diff --git a/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml b/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml new file mode 100644 index 000000000..7c83f1a38 --- /dev/null +++ b/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml @@ -0,0 +1,5 @@ +--- +features: + - | + Added support for Rocky Linux 9.3 repositories and Kolla containers. + Made 9.3 the default version. \ No newline at end of file From 111b3e260b5622a89351af716a91bbc16bdade7b Mon Sep 17 00:00:00 2001 From: Seunghun Lee <45145778+seunghun1ee@users.noreply.github.com> Date: Tue, 9 Jan 2024 16:28:06 +0000 Subject: [PATCH 13/20] Add empty line at release note --- releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml b/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml index 7c83f1a38..9a27dbf03 100644 --- a/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml +++ b/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml @@ -2,4 +2,4 @@ features: - | Added support for Rocky Linux 9.3 repositories and Kolla containers. - Made 9.3 the default version. \ No newline at end of file + Made 9.3 the default version. From cb705428f6fde69d3de10cebfe9b861a4845c16f Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Thu, 11 Jan 2024 09:52:49 +0000 Subject: [PATCH 14/20] Revert unused pulp repo version tags --- etc/kayobe/pulp-repo-versions.yml | 68 +++++++++++++++---------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index f4ac537e5..407aaf298 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -1,38 +1,38 @@ --- # Do not edit! This file is autogenerated by Ansible. stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version: 20211122T102435 -stackhpc_pulp_repo_centos_stream_8_appstream_version: 20231213T031318 -stackhpc_pulp_repo_centos_stream_8_baseos_version: 20231213T031318 +stackhpc_pulp_repo_centos_stream_8_appstream_version: 20231018T041416 +stackhpc_pulp_repo_centos_stream_8_baseos_version: 20231018T041416 stackhpc_pulp_repo_centos_stream_8_extras_common_version: 20230906T030027 stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901 stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: 20230308T103119 -stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20231130T012511 -stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20231125T011517 +stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20230929T005202 +stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20231011T133933 stackhpc_pulp_repo_centos_stream_8_opstools_version: 20230615T071742 -stackhpc_pulp_repo_centos_stream_8_powertools_version: 20231213T031318 -stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20231027T005344 -stackhpc_pulp_repo_centos_stream_9_docker_version: 20231211T120328 -stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20231130T012511 -stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20231115T032622 -stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318 -stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20231027T005344 -stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231218T002857 -stackhpc_pulp_repo_docker_version: 20231211T120328 -stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20231115T032622 +stackhpc_pulp_repo_centos_stream_8_powertools_version: 20231018T041416 +stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20230709T010022 +stackhpc_pulp_repo_centos_stream_9_docker_version: 20230919T015626 +stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20230929T005202 +stackhpc_pulp_repo_centos_stream_9_openstack_yoga_version: 20231005T010906 +stackhpc_pulp_repo_centos_stream_9_opstools_version: 20230615T071742 +stackhpc_pulp_repo_centos_stream_9_storage_ceph_pacific_version: 20230709T010022 +stackhpc_pulp_repo_docker_ce_ubuntu_version: 20231020T014922 +stackhpc_pulp_repo_docker_version: 20230919T015626 +stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20231012T003815 stackhpc_pulp_repo_elrepo_9_version: 20230907T075311 -stackhpc_pulp_repo_epel_9_version: 20231218T002857 +stackhpc_pulp_repo_epel_9_version: 20231020T014922 stackhpc_pulp_repo_epel_modular_version: 20220913T043117 -stackhpc_pulp_repo_epel_version: 20231218T002857 -stackhpc_pulp_repo_grafana_version: 20231217T003113 -stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20231115T032622 +stackhpc_pulp_repo_epel_version: 20231020T014922 +stackhpc_pulp_repo_grafana_version: 20231020T014922 +stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20230815T010124 stackhpc_pulp_repo_mlnx_ofed_5_7_1_0_2_0_rhel8_6_version: 20220920T151419 stackhpc_pulp_repo_opensearch_2_x_version: 20231202T013234 stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20231202T013234 -stackhpc_pulp_repo_rabbitmq_erlang_version: 20231214T005538 -stackhpc_pulp_repo_rabbitmq_server_version: 20231214T005538 -stackhpc_pulp_repo_rhel_9_influxdb_version: 20231215T005810 -stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20231115T032622 -stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511 +stackhpc_pulp_repo_rabbitmq_erlang_version: 20231015T004919 +stackhpc_pulp_repo_rabbitmq_server_version: 20231018T041416 +stackhpc_pulp_repo_rhel_9_influxdb_version: 20231019T010143 +stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20230815T010124 +stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20230903T003752 stackhpc_pulp_repo_rocky_8_6_appstream_version: 20221105T035018 stackhpc_pulp_repo_rocky_8_6_baseos_version: 20221105T035018 stackhpc_pulp_repo_rocky_8_6_extras_version: 20221105T035018 @@ -43,16 +43,16 @@ stackhpc_pulp_repo_rocky_8_7_baseos_version: 20230506T071747 stackhpc_pulp_repo_rocky_8_7_extras_version: 20230506T071747 stackhpc_pulp_repo_rocky_8_7_nfv_version: 20230505T080038 stackhpc_pulp_repo_rocky_8_7_powertools_version: 20230505T080038 -stackhpc_pulp_repo_rocky_8_8_appstream_version: 20231211T120328 -stackhpc_pulp_repo_rocky_8_8_baseos_version: 20231211T120328 -stackhpc_pulp_repo_rocky_8_8_extras_version: 20231211T120328 -stackhpc_pulp_repo_rocky_8_8_nfv_version: 20231211T120328 -stackhpc_pulp_repo_rocky_8_8_powertools_version: 20231211T120328 -stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715 -stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015 -stackhpc_pulp_repo_rocky_9_1_crb_version: 20231211T120328 -stackhpc_pulp_repo_rocky_9_1_extras_version: 20231211T120328 -stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231208T011702 +stackhpc_pulp_repo_rocky_8_8_appstream_version: 20231020T014922 +stackhpc_pulp_repo_rocky_8_8_baseos_version: 20231020T014922 +stackhpc_pulp_repo_rocky_8_8_extras_version: 20231012T003815 +stackhpc_pulp_repo_rocky_8_8_nfv_version: 20231018T041416 +stackhpc_pulp_repo_rocky_8_8_powertools_version: 20231019T010143 +stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231012T003815 +stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231020T014922 +stackhpc_pulp_repo_rocky_9_1_crb_version: 20231020T014922 +stackhpc_pulp_repo_rocky_9_1_extras_version: 20231020T014922 +stackhpc_pulp_repo_rocky_9_1_highavailability_version: 20231020T014922 stackhpc_pulp_repo_rocky_9_2_appstream_version: 20231211T120328 stackhpc_pulp_repo_rocky_9_2_baseos_version: 20231211T120328 stackhpc_pulp_repo_rocky_9_2_crb_version: 20231207T013715 @@ -63,7 +63,7 @@ stackhpc_pulp_repo_rocky_9_3_baseos_version: 20231215T005810 stackhpc_pulp_repo_rocky_9_3_crb_version: 20231215T005810 stackhpc_pulp_repo_rocky_9_3_extras_version: 20231211T120328 stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20231214T005538 -stackhpc_pulp_repo_treasuredata_4_version: 20231130T012511 +stackhpc_pulp_repo_treasuredata_4_version: 20230903T003752 stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231019T125502 stackhpc_pulp_repo_ubuntu_focal_security_version: 20231018T165217 stackhpc_pulp_repo_ubuntu_focal_version: 20231018T165217 From 87ed108a4a37365a7355539510ee066d136a8997 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Thu, 11 Jan 2024 10:13:52 +0000 Subject: [PATCH 15/20] List kayobe_image_tags to be alphabetical --- etc/kayobe/kolla/globals.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index a46f135bd..79f55f089 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -15,10 +15,6 @@ kayobe_image_tags: centos: yoga-20231024T093507 rocky: yoga-20231218T141822 ubuntu: yoga-20231024T093507 - nova: - centos: yoga-20231113T171023 - rocky: yoga-20240105T120257 - ubuntu: yoga-20231103T161400 cloudkitty: centos: yoga-20231107T165648 rocky: yoga-20231218T141822 @@ -27,10 +23,14 @@ kayobe_image_tags: centos: yoga-20231114T125927 rocky: yoga-20240105T120257 ubuntu: yoga-20231114T125927 + nova: + centos: yoga-20231113T171023 + rocky: yoga-20240105T120257 + ubuntu: yoga-20231103T161400 cloudkitty_tag: "{% raw %}{{ kayobe_image_tags['cloudkitty'][kolla_base_distro] }}{% endraw %}" -nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}" neutron_tag: "{% raw %}{{ kayobe_image_tags['neutron'][kolla_base_distro] }}{% endraw %}" +nova_tag: "{% raw %}{{ kayobe_image_tags['nova'][kolla_base_distro] }}{% endraw %}" opensearch_tag: yoga-20231219T221916 # These overrides are currently redundant, but are kept because it's not obvious that you need them if setting haproxy_tag From fe8bcad19babeaf01bab85abb4665dcd9361c338 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Thu, 11 Jan 2024 10:19:29 +0000 Subject: [PATCH 16/20] Add release note for cephadm fix --- ...rect-rocky-linux-9-cephadm-version-2b43075afed8253c.yaml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 releasenotes/notes/fix-incorrect-rocky-linux-9-cephadm-version-2b43075afed8253c.yaml diff --git a/releasenotes/notes/fix-incorrect-rocky-linux-9-cephadm-version-2b43075afed8253c.yaml b/releasenotes/notes/fix-incorrect-rocky-linux-9-cephadm-version-2b43075afed8253c.yaml new file mode 100644 index 000000000..1e67bd5b0 --- /dev/null +++ b/releasenotes/notes/fix-incorrect-rocky-linux-9-cephadm-version-2b43075afed8253c.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fix the issue where Cephadm version is fixed to Pacific instead of + Quincy for Rocky Linux 9 even though Cephadm Pacific is no longer + available from upstream. From 3a158df4357bbcc27fc27d6594ff93ceab06dad0 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 12 Jan 2024 16:51:29 +0000 Subject: [PATCH 17/20] Revert "Fix Rocky Linux 9 targeting Cephadm Pacific" This reverts commit 3b30a86592f5096b6171a9d6fcda9acb637494b7. --- etc/kayobe/cephadm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/cephadm.yml b/etc/kayobe/cephadm.yml index dd30ccd74..0e0b2fceb 100644 --- a/etc/kayobe/cephadm.yml +++ b/etc/kayobe/cephadm.yml @@ -3,7 +3,7 @@ # Cephadm deployment configuration. # Ceph release name. -cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == 'jammy') or (ansible_facts['distribution_release'] == '9') else 'pacific' }}" +cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == 'jammy') else 'pacific' }}" # Ceph FSID. #cephadm_fsid: @@ -12,7 +12,7 @@ cephadm_ceph_release: "{{ 'quincy' if (ansible_facts['distribution_release'] == cephadm_image: "{{ stackhpc_docker_registry if stackhpc_sync_ceph_images | bool else 'quay.io' }}/ceph/ceph:{{ cephadm_image_tag }}" # Ceph container image tag. -cephadm_image_tag: "{{ 'v17.2.7' if (os_release == 'jammy') or (os_release == '9') else 'v16.2.14' }}" +cephadm_image_tag: "{{ 'v17.2.7' if os_release == 'jammy' else 'v16.2.14' }}" # Ceph custom repo workaround for Ubuntu Jammy as there are no official ceph repos for jammy. cephadm_custom_repos: "{{ ansible_facts['distribution_release'] == 'jammy' }}" From 9ad8a8c361beef8547393b1cc531b42d6f24d64e Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 12 Jan 2024 16:54:29 +0000 Subject: [PATCH 18/20] Revert "Enable installing Elrepo9 for Rocky Linux 9.3 upgrade" This reverts commit 6ffa526fa9bf3e1d80ac0ca42f04d29d9e1f6d00. --- etc/kayobe/dnf.yml | 2 +- .../ci-multinode/inventory/group_vars/seed/stackhpc-dnf-repos | 3 --- etc/kayobe/stackhpc.yml | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/stackhpc-dnf-repos diff --git a/etc/kayobe/dnf.yml b/etc/kayobe/dnf.yml index a506e6740..b060c478f 100644 --- a/etc/kayobe/dnf.yml +++ b/etc/kayobe/dnf.yml @@ -200,7 +200,7 @@ rocky_9_gpg_key: "https://dl.rockylinux.org/pub/rocky/RPM-GPG-KEY-Rocky-9" # Whether to create a repo file for ELRepo. This affects RedHat-based # systems only. -dnf_install_elrepo_9: true +dnf_install_elrepo_9: false # Whether to enable docker dnf repo in stackhpc_dnf_repos dnf_enable_docker: true diff --git a/etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/stackhpc-dnf-repos b/etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/stackhpc-dnf-repos deleted file mode 100644 index df8258662..000000000 --- a/etc/kayobe/environments/ci-multinode/inventory/group_vars/seed/stackhpc-dnf-repos +++ /dev/null @@ -1,3 +0,0 @@ ---- -# To ensure seed can install packages during `kayobe seed host configure` -dnf_custom_repos: "{{ stackhpc_dnf_repos }}" diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index a99ae81ad..3c0e32430 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -199,7 +199,7 @@ stackhpc_repo_epel_9_version: "{{ stackhpc_repo_distribution }}" # ELRepo 9 stackhpc_repo_elrepo_9_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/elrepo/elrepo/el9/x86_64/{{ stackhpc_repo_elrepo_9_version }}" -stackhpc_repo_elrepo_9_version: "20230907T075311" +stackhpc_repo_elrepo_9_version: "{{ stackhpc_repo_distribution }}" ############################################################################### # Sources From 7a22e1f3b9640a0a38d5c99c3db91637d37a632c Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Fri, 12 Jan 2024 16:58:04 +0000 Subject: [PATCH 19/20] Remove wrong release note --- ...rect-rocky-linux-9-cephadm-version-2b43075afed8253c.yaml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 releasenotes/notes/fix-incorrect-rocky-linux-9-cephadm-version-2b43075afed8253c.yaml diff --git a/releasenotes/notes/fix-incorrect-rocky-linux-9-cephadm-version-2b43075afed8253c.yaml b/releasenotes/notes/fix-incorrect-rocky-linux-9-cephadm-version-2b43075afed8253c.yaml deleted file mode 100644 index 1e67bd5b0..000000000 --- a/releasenotes/notes/fix-incorrect-rocky-linux-9-cephadm-version-2b43075afed8253c.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -fixes: - - | - Fix the issue where Cephadm version is fixed to Pacific instead of - Quincy for Rocky Linux 9 even though Cephadm Pacific is no longer - available from upstream. From f6cff63ac5b1095f75914d54c28665858216b359 Mon Sep 17 00:00:00 2001 From: Seunghun Lee Date: Mon, 15 Jan 2024 10:25:31 +0000 Subject: [PATCH 20/20] Add note about new contianer images and repo versions --- .../notes/add-rocky-9.3-repos-454c2f825e088417.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml b/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml index 9a27dbf03..9a25d0e1e 100644 --- a/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml +++ b/releasenotes/notes/add-rocky-9.3-repos-454c2f825e088417.yaml @@ -2,4 +2,8 @@ features: - | Added support for Rocky Linux 9.3 repositories and Kolla containers. - Made 9.3 the default version. + Made 9.3 the default version for Rocky Linux. + - | + Updated Rocky Linux 9.2 pulp repo versions. + Added Rocky Linux 9.3 pulp repo versions. + Rebuilt Kolla containers with Rocky Linux 9.3.