misc minor fixes

Author: Alex-Welsh

etc/kayobe/kolla.yml

@@ -207,7 +207,7 @@ stackhpc_rocky_10_third_party_repos:
   - url: "{{ stackhpc_repo_grafana_url }}"
     file: "grafana.repo"
     tag: "grafana"
-  - url: "{{ stackhpc_repo_rhel_10_fluentd_6_url }}"
+  - url: "{{ stackhpc_repo_rhel_10_fluent_6_url }}"
     file: "td.repo"
     tag: "treasuredata"
   - url: "{{ stackhpc_repo_rhel_10_mariadb_10_11_url }}"
@@ -228,10 +228,10 @@ stackhpc_rocky_10_third_party_repos:
   - url: "{{ stackhpc_repo_rhel9_rabbitmq_server_url }}"
     file: "rabbitmq_rabbitmq-server.repo"
     tag: "rabbitmq_rabbitmq-server"
-  - url: "{{ stackhpc_repo_opensearch_3_x_url }}"
+  - url: "{{ stackhpc_repo_opensearch_3_x_yum_url }}"
     file: "opensearch.repo"
     tag: "opensearch-3.x"
-  - url: "{{ stackhpc_repo_opensearch_dashboards_2_x_url }}"
+  - url: "{{ stackhpc_repo_opensearch_dashboards_3_x_yum_url }}"
     file: "opensearch.repo"
     tag: "opensearch-dashboards-3.x"
   - url: "{{ stackhpc_repo_almalinux_10_proxysql_3_0_url }}"

etc/kayobe/kolla/kolla-build.conf

@@ -10,4 +10,3 @@ base_tag = 10.{{ stackhpc_pulp_repo_rocky_10_minor_version }}
 rpm_setup_config = 
 {% endif %}
 build_args = {{ (kolla_build_args | default({})).items() | map('join', ':') | join(',') }}
-logs = /tmp/kolla

etc/kayobe/pulp.yml

@@ -216,7 +216,7 @@ stackhpc_pulp_rpm_architectures:
 
 # Whether to sync Rocky Linux 10 packages.
 stackhpc_pulp_sync_rocky_10: "{{ os_distribution == 'rocky' and os_release == '10' }}"
-# Rocky 10 minor version number. Supported values: 1. Default is 1
+# Rocky 10 minor version number. Supported values: 2. Default is 2
 stackhpc_pulp_repo_rocky_10_minor_version: '2'
 # Rocky 10 Snapshot versions. The defaults use the appropriate version from
 # pulp-repo-versions.yml for the selected minor release.
@@ -428,16 +428,16 @@ stackhpc_pulp_rpm_repos:
     required: "{{ stackhpc_pulp_sync_el_10 | bool and 'aarch64' in stackhpc_pulp_rpm_architectures }}"
 
   # Additional RHEL 10 repositories
-  - name: MariaDB 11.6 for RHEL 10
-    url: "{{ stackhpc_release_pulp_content_url }}/mariadb-11.6/yum/rhel/10/x86_64/{{ stackhpc_pulp_repo_rhel_10_mariadb_11_6_version }}"
-    distribution_name: "rhel-10-mariadb-11-6-"
-    base_path: "mariadb-11.6/yum/rhel/10/x86_64/"
+  - name: MariaDB 11.4 for RHEL 10
+    url: "{{ stackhpc_release_pulp_content_url }}/mariadb-11.4/yum/rhel/10/x86_64/{{ stackhpc_pulp_repo_rhel_10_mariadb_11_4_version }}"
+    distribution_name: "rhel-10-mariadb-11-4-"
+    base_path: "mariadb-11.4/yum/rhel/10/x86_64/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_10 | bool and 'x86_64' in stackhpc_pulp_rpm_architectures }}"
 
-  - name: MariaDB 11.6 for RHEL 10 - aarch64
-    url: "{{ stackhpc_release_pulp_content_url }}/mariadb-11.6/yum/rhel/10/aarch64/{{ stackhpc_pulp_repo_rhel_10_mariadb_11_6_aarch64_version }}"
-    distribution_name: "rhel-10-mariadb-11-6-aarch64-"
-    base_path: "mariadb-11.6/yum/rhel/10/aarch64/"
+  - name: MariaDB 11.4 for RHEL 10 - aarch64
+    url: "{{ stackhpc_release_pulp_content_url }}/mariadb-11.4/yum/rhel/10/aarch64/{{ stackhpc_pulp_repo_rhel_10_mariadb_11_4_aarch64_version }}"
+    distribution_name: "rhel-10-mariadb-11-4-aarch64-"
+    base_path: "mariadb-11.4/yum/rhel/10/aarch64/"
     required: "{{ stackhpc_pulp_sync_for_local_container_build | bool and stackhpc_pulp_sync_el_10 | bool and 'aarch64' in stackhpc_pulp_rpm_architectures }}"
 
   - name: DOCA Online Repo {{ stackhpc_pulp_rocky_10_doca_version }} - RHEL 10

tools/kolla-images.py

@@ -103,7 +103,6 @@
 
 # List of supported base distributions and versions.
 SUPPORTED_BASE_DISTROS = [
-    "rocky-9",
     "rocky-10",
     "ubuntu-noble",
 ]