Skip to content

Commit

Permalink
Merge pull request #1164 from stackhpc/rocky-linux9.4-support
Browse files Browse the repository at this point in the history
Rocky Linux 9.4 support
  • Loading branch information
markgoddard committed Jul 23, 2024
2 parents e5969e8 + 68f518d commit b5e3554
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 20 deletions.
8 changes: 1 addition & 7 deletions etc/kayobe/kolla-image-tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,19 @@
# where the key is the OS distro and the value is the tag to deploy.
kolla_image_tags:
openstack:
rocky-9: 2023.1-rocky-9-20240621T104542
rocky-9: 2023.1-rocky-9-20240709T132012
ubuntu-jammy: 2023.1-ubuntu-jammy-20240621T104542
bifrost_deploy:
rocky-9: 2023.1-rocky-9-20240423T125905
ubuntu-jammy: 2023.1-ubuntu-jammy-20240423T125905
cinder:
rocky-9: 2023.1-rocky-9-20240701T123544
ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544
glance:
rocky-9: 2023.1-rocky-9-20240701T123544
ubuntu-jammy: 2023.1-ubuntu-jammy-20240701T123544
haproxy_ssh:
rocky-9: 2023.1-rocky-9-20240509T102329
ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329
letsencrypt:
rocky-9: 2023.1-rocky-9-20240509T102329
ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T102329
nova:
rocky-9: 2023.1-rocky-9-20240702T082319
ubuntu-jammy: 2023.1-ubuntu-jammy-20240702T082319
opensearch:
ubuntu-jammy: 2023.1-ubuntu-jammy-20240509T094444
27 changes: 16 additions & 11 deletions etc/kayobe/pulp-repo-versions.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
---
# Do not edit! This file is autogenerated by Ansible.
stackhpc_pulp_repo_centos_stream_9_docker_version: 20240412T001239
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240406T233848
stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version: 20240417T235558
stackhpc_pulp_repo_centos_stream_9_docker_version: 20240702T000233
stackhpc_pulp_repo_centos_stream_9_nfv_openvswitch_version: 20240708T235303
stackhpc_pulp_repo_centos_stream_9_openstack_antelope_version: 20240702T000233
stackhpc_pulp_repo_centos_stream_9_opstools_version: 20231213T031318
stackhpc_pulp_repo_centos_stream_9_storage_ceph_quincy_version: 20231104T015751
stackhpc_pulp_repo_docker_ce_ubuntu_jammy_version: 20240122T172142
stackhpc_pulp_repo_elrepo_9_version: 20240214T143520
stackhpc_pulp_repo_epel_9_version: 20240417T235558
stackhpc_pulp_repo_grafana_version: 20240417T235558
stackhpc_pulp_repo_opensearch_2_x_version: 20240403T011714
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240403T011714
stackhpc_pulp_repo_rabbitmq_erlang_version: 20240413T235245
stackhpc_pulp_repo_rabbitmq_server_version: 20240330T001322
stackhpc_pulp_repo_rhel_9_influxdb_version: 20240417T000423
stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240208T002309
stackhpc_pulp_repo_epel_9_version: 20240708T235303
stackhpc_pulp_repo_grafana_version: 20240708T235303
stackhpc_pulp_repo_opensearch_2_x_version: 20240626T000533
stackhpc_pulp_repo_opensearch_dashboards_2_x_version: 20240626T000533
stackhpc_pulp_repo_rabbitmq_erlang_version: 20240506T000343
stackhpc_pulp_repo_rabbitmq_server_version: 20240704T001154
stackhpc_pulp_repo_rhel_9_influxdb_version: 20240702T000233
stackhpc_pulp_repo_rhel_9_mariadb_10_6_version: 20240517T012522
stackhpc_pulp_repo_rhel_9_treasuredata_4_version: 20231130T012511
stackhpc_pulp_repo_rocky_9_1_appstream_version: 20231207T013715
stackhpc_pulp_repo_rocky_9_1_baseos_version: 20231206T014015
Expand All @@ -31,6 +31,11 @@ stackhpc_pulp_repo_rocky_9_3_baseos_version: 20240413T014042
stackhpc_pulp_repo_rocky_9_3_crb_version: 20240413T014042
stackhpc_pulp_repo_rocky_9_3_extras_version: 20240413T014042
stackhpc_pulp_repo_rocky_9_3_highavailability_version: 20240404T012937
stackhpc_pulp_repo_rocky_9_4_appstream_version: 20240704T001154
stackhpc_pulp_repo_rocky_9_4_baseos_version: 20240707T011413
stackhpc_pulp_repo_rocky_9_4_crb_version: 20240702T000233
stackhpc_pulp_repo_rocky_9_4_extras_version: 20240707T235817
stackhpc_pulp_repo_rocky_9_4_highavailability_version: 20240629T235004
stackhpc_pulp_repo_rocky_9_sig_security_common_version: 20240708T235303
stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20240418T070026
stackhpc_pulp_repo_ubuntu_jammy_security_version: 20240418T043733
Expand Down
4 changes: 2 additions & 2 deletions etc/kayobe/pulp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ stackhpc_pulp_distribution_deb_production: >-

# Whether to sync Rocky Linux 9 packages.
stackhpc_pulp_sync_rocky_9: "{{ os_distribution == 'rocky' }}"
# Rocky 9 minor version number. Supported values: 1, 2, 3. Default is 3
stackhpc_pulp_repo_rocky_9_minor_version: 3
# Rocky 9 minor version number. Supported values: 1, 2, 3, 4. Default is 4
stackhpc_pulp_repo_rocky_9_minor_version: 4
# 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) }}"
Expand Down
2 changes: 2 additions & 0 deletions etc/kayobe/trivy/allowed-vulnerabilities.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
#
# barbican_api_allowed_vulnerabilities:
# - CVE-2023-31047
fluentd_allowed_vulnerabilities:
- CVE-2024-27280

###############################################################################
# Dummy variable to allow Ansible to accept this file.
Expand Down
9 changes: 9 additions & 0 deletions releasenotes/notes/add-rocky-94-repos-27caa21c77252866.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
features:
- |
Added support for Rocky Linux 9.4 repositories and Kolla containers.
Made 9.4 the default version for Rocky Linux.
- |
Updated Rocky Linux 9.3 pulp repo versions.
Added Rocky Linux pulp repo versions.
Rebuilt Kolla containers with Rocky 9.4.

0 comments on commit b5e3554

Please sign in to comment.