Skip to content

Commit 641a2cd

Browse files
committed
added repo lists and conditionals to pick between 9 and 10 sets
1 parent 49627c3 commit 641a2cd

1 file changed

Lines changed: 86 additions & 2 deletions

File tree

etc/kayobe/kolla.yml

Lines changed: 86 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,92 @@ stackhpc_epel_9_repos:
239239
file: "epel.repo"
240240
tag: "epel"
241241

242-
base_centos_repo_overrides_post_yum_list: "{{ stackhpc_rocky_9_repos + stackhpc_epel_9_repos + stackhpc_rocky_9_additional_repos + stackhpc_rocky_9_third_party_repos }}"
243-
stackhpc_yum_repos: "{{ stackhpc_rocky_9_repos }}"
242+
# Repositories for Rocky Linux 10
243+
stackhpc_rocky_10_repos:
244+
- url: "{{ stackhpc_repo_rocky_10_baseos_url }}"
245+
file: "rocky.repo"
246+
tag: "baseos"
247+
- url: "{{ stackhpc_repo_rocky_10_appstream_url }}"
248+
file: "rocky.repo"
249+
tag: "appstream"
250+
- url: "{{ stackhpc_repo_rocky_10_extras_url }}"
251+
file: "rocky-extras.repo"
252+
tag: "extras"
253+
254+
# Additional repositories for Rocky Linux 10
255+
stackhpc_rocky_10_additional_repos:
256+
- url: "{{ stackhpc_repo_centos_stream_10_nfv_openvswitch_url }}"
257+
file: "CentOS-NFV-OpenvSwitch.repo"
258+
tag: "centos-nfv-openvswitch"
259+
- url: "{{ stackhpc_repo_centos_stream_10_openstack_epoxy_url }}"
260+
file: "CentOS-OpenStack-epoxy.repo"
261+
tag: "centos-openstack-epoxy"
262+
- url: "{{ stackhpc_repo_rocky_10_crb_url }}"
263+
file: "rocky.repo"
264+
tag: "crb"
265+
- url: "{{ stackhpc_repo_rocky_10_highavailability_url }}"
266+
file: "rocky-addons.repo"
267+
tag: "highavailability"
268+
269+
# List of third-party repositories for Rocky Linux 10
270+
stackhpc_rocky_10_third_party_repos:
271+
- url: "{{ stackhpc_repo_grafana_url }}"
272+
file: "grafana.repo"
273+
tag: "grafana"
274+
- url: "{{ stackhpc_repo_rhel_9_treasuredata_5_url }}"
275+
file: "td.repo"
276+
tag: "treasuredata"
277+
- url: "{{ stackhpc_repo_rhel_9_mariadb_10_11_url }}"
278+
file: "mariadb.repo"
279+
tag: "mariadb"
280+
- url: "{{ stackhpc_repo_rhel_9_influxdb_url }}"
281+
file: "influxdb.repo"
282+
tag: "influxdb"
283+
- url: "{{ stackhpc_repo_centos_stream_10_storage_ceph_squid_url }}"
284+
file: "CentOS-Ceph-Squid.repo"
285+
tag: "centos-ceph-squid"
286+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_url }}"
287+
file: "rabbitmq_rabbitmq-erlang.repo"
288+
tag: "rabbitmq_rabbitmq-erlang"
289+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_26_url }}"
290+
file: "copr-rabbitmq-erlang-26.repo"
291+
tag: "copr-rabbitmq-erlang-26"
292+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_erlang_27_url }}"
293+
file: "copr-rabbitmq-erlang-27.repo"
294+
tag: "copr-rabbitmq-erlang-27"
295+
- url: "{{ stackhpc_repo_rhel9_rabbitmq_server_url }}"
296+
file: "rabbitmq_rabbitmq-server.repo"
297+
tag: "rabbitmq_rabbitmq-server"
298+
- url: "{{ stackhpc_repo_opensearch_2_x_url }}"
299+
file: "opensearch.repo"
300+
tag: "opensearch-2.x"
301+
- url: "{{ stackhpc_repo_opensearch_dashboards_2_x_url }}"
302+
file: "opensearch.repo"
303+
tag: "opensearch-dashboards-2.x"
304+
- url: "{{ stackhpc_repo_almalinux_9_proxysql_2_7_url }}"
305+
file: "proxysql.repo"
306+
tag: "proxysql"
307+
308+
# List of EPEL 10
309+
stackhpc_epel_10_repos:
310+
- url: "{{ stackhpc_repo_epel_10_url }}"
311+
file: "epel.repo"
312+
tag: "epel"
313+
314+
#TODO: check if base_distro_version comes in as jusr major or with minor
315+
# if from os_release would be major - might be better to use those??
316+
base_centos_repo_overrides_post_yum_list: |
317+
{% if kolla_base_distro == 'rocky' and kolla_base_distro_version == '9' %}
318+
{{ stackhpc_rocky_9_repos + stackhpc_epel_9_repos + stackhpc_rocky_9_additional_repos + stackhpc_rocky_9_third_party_repos }}
319+
{% elif kolla_base_distro == 'rocky' and kolla_base_distro_version == '9' %}
320+
{{ stackhpc_rocky_10_repos + stackhpc_epel_10_repos + stackhpc_rocky_10_additional_repos + stackhpc_rocky_10_third_party_repos }}
321+
{% endif %}
322+
stackhpc_yum_repos: |
323+
{% if kolla_base_distro == 'rocky' and kolla_base_distro_version == '9' %}
324+
{{ stackhpc_rocky_9_repos }}
325+
{% elif kolla_base_distro == 'rocky' and kolla_base_distro_version == '9' %}
326+
{{ stackhpc_rocky_10_repos }}
327+
{% endif %}
244328
245329
# Apt sources.list entry prefix.
246330
# If using an authenticating Pulp proxy we need to trust the repository because

0 commit comments

Comments
 (0)