Skip to content

Commit 5c6ffd7

Browse files
mnasiadkamnasiadka
committed
Stop duplicating repos in repos.yaml
Change-Id: Ic8bfaedb1e94dd8b64fa8a63d9cd3b76a2b73ffb Signed-off-by: Michal Nasiadka <[email protected]>
1 parent 806602e commit 5c6ffd7

File tree

2 files changed

+5
-233
lines changed

2 files changed

+5
-233
lines changed

‎kolla/template/methods.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,8 @@ def handle_repos(context, reponames, mode):
126126
commands = ''
127127

128128
try:
129-
repo_list = repo_data['%s-%s' % (base_distro, base_arch)]
129+
repo_list = repo_data[base_distro] | \
130+
repo_data['%s-%s' % (base_distro, base_arch)]
130131
except KeyError:
131132
# NOTE(hrw): Fallback to distro list
132133
repo_list = repo_data[base_distro]

‎kolla/template/repos.yaml‎

Lines changed: 3 additions & 232 deletions
Original file line numberDiff line numberDiff line change
@@ -78,80 +78,10 @@ centos:
7878
name: "rabbitmq_rabbitmq-server"
7979

8080
centos-aarch64:
81-
ceph:
82-
gpgkey: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Storage"
83-
metalink: "https://mirrors.centos.org/metalink?repo=centos-storage-sig-ceph-squid-9-stream&arch=$basearch"
84-
name: "centos-ceph-squid"
85-
crb:
86-
distro: True
87-
name: "crb"
88-
docker-ce:
89-
gpgkey: "https://download.docker.com/linux/centos/gpg"
90-
baseurl: "https://download.docker.com/linux/centos/$releasever/$basearch/stable"
91-
name: "docker-ce"
92-
epel:
93-
gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever"
94-
metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir"
95-
name: "epel"
9681
erlang:
9782
baseurl: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/rhel-$releasever-aarch64/"
9883
gpgkey: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/pubkey.gpg"
9984
name: "copr-rabbitmq-erlang"
100-
extras:
101-
distro: True
102-
name: "extras"
103-
fluentd:
104-
baseurl: "https://packages.treasuredata.com/lts/5/redhat/9/$basearch"
105-
gpgkey: "https://packages.treasuredata.com/GPG-KEY-td-agent"
106-
name: "fluent-package-lts"
107-
grafana:
108-
baseurl: "https://rpm.grafana.com"
109-
gpgkey: "https://rpm.grafana.com/gpg.key"
110-
name: "grafana"
111-
hacluster:
112-
name: "highavailability"
113-
distro: true
114-
influxdb:
115-
baseurl: "https://repos.influxdata.com/rhel/9/$basearch/stable"
116-
gpgkey: "https://repos.influxdata.com/influxdata-archive_compat.key"
117-
name: "influxdb"
118-
kolla_el10:
119-
baseurl: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/epel-10-$basearch/"
120-
gpgkey: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/pubkey.gpg"
121-
name: "kolla_el10"
122-
mariadb:
123-
baseurl: "https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/$releasever/$basearch"
124-
gpgkey: "https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB"
125-
name: "mariadb"
126-
opensearch:
127-
baseurl: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/yum"
128-
gpgkey: "https://artifacts.opensearch.org/publickeys/opensearch-release.pgp"
129-
repo_gpgcheck: 1
130-
name: "opensearch32.x"
131-
opensearch-dashboards:
132-
baseurl: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/yum"
133-
gpgkey: "https://artifacts.opensearch.org/publickeys/opensearch-release.pgp"
134-
repo_gpgcheck: 1
135-
name: "opensearch-dashboards-3.x"
136-
openvswitch:
137-
gpgkey: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-NFV"
138-
metalink: "https://mirrors.centos.org/metalink?repo=centos-nfv-sig-openvswitch-2-$stream&arch=$basearch&protocol=https,http"
139-
name: "centos-nfv-openvswitch"
140-
opstools:
141-
distro: True
142-
name: "opstools"
143-
proxysql:
144-
baseurl: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/9"
145-
gpgkey: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key"
146-
name: "proxysql"
147-
rabbitmq:
148-
baseurl: |
149-
https://yum1.rabbitmq.com/rabbitmq/el/9/noarch
150-
https://yum2.rabbitmq.com/rabbitmq/el/9/noarch
151-
gpgkey: |
152-
https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key
153-
https://github.com/rabbitmq/signing-keys/releases/download/3.0/rabbitmq-release-signing-key.asc
154-
name: "rabbitmq_rabbitmq-server"
15585

15686
# NOTE(mnasiadka): For RabbitMQ Debuntu suite names is following:
15787
# https://www.rabbitmq.com/install-debian.html#apt-cloudsmith
@@ -209,51 +139,6 @@ debian:
209139
gpg_key: "rabbitmq.gpg"
210140

211141
debian-aarch64:
212-
docker-ce:
213-
url: "https://download.docker.com/linux/debian"
214-
suite: "bookworm"
215-
component: "stable"
216-
gpg_key: "docker-ce.asc"
217-
erlang:
218-
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
219-
suite: "jammy"
220-
component: "main"
221-
gpg_key: "erlang-ppa.gpg"
222-
fluentd:
223-
url: "https://packages.treasuredata.com/lts/5/debian/bookworm"
224-
suite: "bookworm"
225-
component: "contrib"
226-
gpg_key: "treasuredata.asc"
227-
grafana:
228-
url: "https://apt.grafana.com"
229-
suite: "stable"
230-
component: "main"
231-
gpg_key: "grafana.asc"
232-
influxdb:
233-
url: "https://repos.influxdata.com/ubuntu"
234-
suite: "jammy"
235-
component: "stable"
236-
gpg_key: "influxdb.asc"
237-
mariadb:
238-
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/debian"
239-
suite: "bookworm"
240-
component: "main"
241-
gpg_key: "mariadb.gpg"
242-
opensearch:
243-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/"
244-
suite: "stable"
245-
component: "main"
246-
gpg_key: "opensearch.asc"
247-
opensearch-dashboards:
248-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/"
249-
suite: "stable"
250-
component: "main"
251-
gpg_key: "opensearch.asc"
252-
proxysql:
253-
url: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/bookworm/"
254-
suite: "./"
255-
component: ""
256-
gpg_key: "proxysql.asc"
257142
rabbitmq:
258143
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
259144
suite: "bookworm"
@@ -342,80 +227,10 @@ rocky:
342227
name: "rabbitmq_rabbitmq-server"
343228

344229
rocky-aarch64:
345-
ceph:
346-
gpgkey: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-Storage"
347-
metalink: "https://mirrors.centos.org/metalink?repo=centos-storage-sig-ceph-squid-9-stream&arch=$basearch"
348-
name: "centos-ceph-squid"
349-
crb:
350-
distro: True
351-
name: "crb"
352-
docker-ce:
353-
gpgkey: "https://download.docker.com/linux/centos/gpg"
354-
baseurl: "https://download.docker.com/linux/centos/$releasever/$basearch/stable"
355-
name: "docker-ce"
356-
epel:
357-
gpgkey: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-$releasever"
358-
metalink: "https://mirrors.fedoraproject.org/metalink?repo=epel-$releasever&arch=$basearch&infra=$infra&content=$contentdir"
359-
name: "epel"
360230
erlang:
361231
baseurl: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/rhel-$releasever-aarch64/"
362232
gpgkey: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/rabbitmq-erlang-27/pubkey.gpg"
363233
name: "copr-rabbitmq-erlang"
364-
extras:
365-
distro: True
366-
name: "extras"
367-
fluentd:
368-
baseurl: "https://packages.treasuredata.com/lts/5/redhat/9/$basearch"
369-
gpgkey: "https://packages.treasuredata.com/GPG-KEY-td-agent"
370-
name: "fluent-package-lts"
371-
grafana:
372-
baseurl: "https://rpm.grafana.com"
373-
gpgkey: "https://rpm.grafana.com/gpg.key"
374-
name: "grafana"
375-
hacluster:
376-
name: "highavailability"
377-
distro: true
378-
influxdb:
379-
baseurl: "https://repos.influxdata.com/rhel/9/$basearch/stable"
380-
gpgkey: "https://repos.influxdata.com/influxdata-archive_compat.key"
381-
name: "influxdb"
382-
kolla_el10:
383-
baseurl: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/epel-10-$basearch/"
384-
gpgkey: "https://download.copr.fedorainfracloud.org/results/@openstack-kolla/el10-missing/pubkey.gpg"
385-
name: "kolla_el10"
386-
mariadb:
387-
baseurl: "https://dlm.mariadb.com/repo/mariadb-server/10.11/yum/rhel/$releasever/$basearch"
388-
gpgkey: "https://downloads.mariadb.com/MariaDB/RPM-GPG-KEY-MariaDB"
389-
name: "mariadb"
390-
opensearch:
391-
baseurl: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/yum"
392-
gpgkey: "https://artifacts.opensearch.org/publickeys/opensearch-release.pgp"
393-
repo_gpgcheck: 1
394-
name: "opensearch32.x"
395-
opensearch-dashboards:
396-
baseurl: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/yum"
397-
gpgkey: "https://artifacts.opensearch.org/publickeys/opensearch-release.pgp"
398-
repo_gpgcheck: 1
399-
name: "opensearch-dashboards-3.x"
400-
openvswitch:
401-
gpgkey: "https://www.centos.org/keys/RPM-GPG-KEY-CentOS-SIG-NFV"
402-
metalink: "https://mirrors.centos.org/metalink?repo=centos-nfv-sig-openvswitch-2-$stream&arch=$basearch&protocol=https,http"
403-
name: "centos-nfv-openvswitch"
404-
opstools:
405-
distro: True
406-
name: "opstools"
407-
proxysql:
408-
baseurl: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/9"
409-
gpgkey: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key"
410-
name: "proxysql"
411-
rabbitmq:
412-
baseurl: |
413-
https://yum1.rabbitmq.com/rabbitmq/el/9/noarch
414-
https://yum2.rabbitmq.com/rabbitmq/el/9/noarch
415-
gpgkey: |
416-
https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-server.9F4587F226208342.key
417-
https://github.com/rabbitmq/signing-keys/releases/download/3.0/rabbitmq-release-signing-key.asc
418-
name: "rabbitmq_rabbitmq-server"
419234

420235
ubuntu:
421236
docker-ce:
@@ -471,55 +286,11 @@ ubuntu:
471286
gpg_key: "rabbitmq.gpg"
472287

473288
ubuntu-aarch64:
474-
docker-ce:
475-
url: "https://download.docker.com/linux/ubuntu"
476-
suite: "noble"
477-
component: "stable"
478-
gpg_key: "docker-ce.asc"
479-
erlang:
480-
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
481-
suite: "noble"
482-
component: "main"
483-
gpg_key: "erlang-ppa.gpg"
484-
fluentd:
485-
url: "https://packages.treasuredata.com/lts/5/ubuntu/noble/"
486-
suite: "noble"
487-
component: "contrib"
488-
gpg_key: "treasuredata.asc"
489-
grafana:
490-
url: "https://apt.grafana.com"
491-
suite: "stable"
492-
component: "main"
493-
gpg_key: "grafana.asc"
494-
influxdb:
495-
url: "https://repos.influxdata.com/ubuntu"
496-
# TODO(mnasiadka): Switch to noble when available
497-
suite: "jammy"
498-
component: "stable"
499-
gpg_key: "influxdb.asc"
500-
mariadb:
501-
url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu"
502-
suite: "noble"
503-
component: "main"
504-
gpg_key: "mariadb.gpg"
505-
opensearch:
506-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/"
507-
suite: "stable"
508-
component: "main"
509-
gpg_key: "opensearch.asc"
510-
opensearch-dashboards:
511-
url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/"
512-
suite: "stable"
513-
component: "main"
514-
gpg_key: "opensearch.asc"
515-
proxysql:
516-
url: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/noble/"
517-
suite: "./"
518-
component: ""
519-
gpg_key: "proxysql.asc"
520289
rabbitmq:
521-
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
290+
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
522291
suite: "noble"
523292
component: "main"
293+
# NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not
294+
# syncing binary-aarch64 - we're using amd64 here.
524295
arch: "amd64"
525296
gpg_key: "rabbitmq.gpg"

0 commit comments

Comments
 (0)