diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml index 74ee91030..07c8f94d3 100644 --- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml @@ -39,6 +39,7 @@ stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_ve 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 }}" +stackhpc_repo_almalinux_9_proxysql_2_7_version: "{{ stackhpc_pulp_repo_almalinux_9_proxysql_2_7_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_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_version }}" diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 755804d86..8465f3b36 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -64,6 +64,7 @@ stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_ve 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 }}" +stackhpc_repo_almalinux_9_proxysql_2_7_version: "{{ stackhpc_pulp_repo_almalinux_9_proxysql_2_7_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_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_version }}" diff --git a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml index 84dc5bc90..c1e7a663b 100644 --- a/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-multinode/stackhpc-ci.yml @@ -39,6 +39,7 @@ stackhpc_repo_rhel_9_influxdb_version: "{{ stackhpc_pulp_repo_rhel_9_influxdb_ve 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 }}" +stackhpc_repo_almalinux_9_proxysql_2_7_version: "{{ stackhpc_pulp_repo_almalinux_9_proxysql_2_7_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_9_baseos_version: "{{ stackhpc_pulp_repo_rocky_9_baseos_version }}" diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index b0d065681..55f0c0970 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -9,3 +9,5 @@ kolla_image_tags: neutron_metadata_agent: rocky-9: 2025.1-rocky-9-20250626T074649 ubuntu-noble: 2025.1-ubuntu-noble-20250626T074649 + proxysql: + rocky-9: 2025.1-rocky-9-20250701T091924 diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index d741627fe..5e6a8b973 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -206,6 +206,9 @@ stackhpc_rocky_9_third_party_repos: - url: "{{ stackhpc_repo_opensearch_dashboards_2_x_url }}" file: "opensearch.repo" tag: "opensearch-dashboards-2.x" + - url: "{{ stackhpc_repo_almalinux_9_proxysql_2_7_url }}" + file: "proxysql.repo" + tag: "proxysql" # List of EPEL 9 stackhpc_epel_9_repos: diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index f7d53f39f..a7315553d 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -22,6 +22,7 @@ stackhpc_pulp_repo_rhel_9_6_doca_modules_version: 00000000T000000 stackhpc_pulp_repo_rhel_9_6_doca_version: 00000000T000000 ###### stackhpc_pulp_repo_rhel_9_influxdb_version: 20250529T023704 +stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version: 20250627T134211 stackhpc_pulp_repo_rhel_9_mariadb_10_11_version: 20250523T014203 stackhpc_pulp_repo_rhel_9_rabbitmq_erlang_version: 20240711T091318 stackhpc_pulp_repo_rhel_9_rabbitmq_server_version: 20240711T091318 diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 812ebd4c1..345850b26 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -367,6 +367,12 @@ stackhpc_pulp_rpm_repos: base_path: "doca-modules/{{ stackhpc_pulp_doca_version }}/rhel9.{{ stackhpc_pulp_repo_rocky_9_minor_version }}/x86_64/" required: "{{ stackhpc_pulp_sync_ofed | bool and stackhpc_pulp_sync_el_9 | bool }}" + - name: ProxySQL 2.7 for AlmaLinux 9 + url: "{{ stackhpc_release_pulp_content_url }}/ProxySQL/proxysql-2.7.x/almalinux/9/{{ stackhpc_pulp_repo_almalinux_9_proxysql_2_7_version }}" + distribution_name: "almalinux-9-proxysql-2.7-" + base_path: "ProxySQL/proxysql-2.7.x/almalinux/9/" + 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 10b422d4d..05d404fa1 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -104,6 +104,10 @@ stackhpc_repo_opensearch_2_x_version: "{{ stackhpc_repo_distribution }}" 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 ProxySQL +stackhpc_repo_almalinux_9_proxysql_2_7_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/ProxySQL/proxysql-2.7.x/almalinux/9/{{ stackhpc_repo_almalinux_9_proxysql_2_7_version }}" +stackhpc_repo_almalinux_9_proxysql_2_7_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 }}" diff --git a/releasenotes/notes/proxysql-repo-definition-0400b08e4455e1c0.yaml b/releasenotes/notes/proxysql-repo-definition-0400b08e4455e1c0.yaml new file mode 100644 index 000000000..5e3a24438 --- /dev/null +++ b/releasenotes/notes/proxysql-repo-definition-0400b08e4455e1c0.yaml @@ -0,0 +1,6 @@ +--- +features: + - | + Added repo definitions for ProxySQL for AlmaLinux 9 in pulp. ProxySQL + container images for Rocky Linux 9 are now built using version controlled + packages from Ark.