From a6672fdc1770b3c39d8a18b72688082ec4cb6f0d Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Fri, 18 Jul 2025 11:18:52 +0200 Subject: [PATCH 1/3] [Kolla/Ubuntu] Use docker-ce repositories from Ark --- etc/kayobe/kolla/repos.yaml | 145 ++++++++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 etc/kayobe/kolla/repos.yaml diff --git a/etc/kayobe/kolla/repos.yaml b/etc/kayobe/kolla/repos.yaml new file mode 100644 index 0000000000..d7c5c765c5 --- /dev/null +++ b/etc/kayobe/kolla/repos.yaml @@ -0,0 +1,145 @@ +--- +ubuntu: + docker-ce: + url: "{{ stackhpc_repo_docker_ce_ubuntu_noble_url }}" + suite: "noble" + component: "stable" + gpg_key: "docker-ce.asc" + erlang: + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" + suite: "noble" + component: "main" + gpg_key: "erlang-ppa.gpg" + fluentd: + url: "https://packages.treasuredata.com/lts/5/ubuntu/noble/" + suite: "noble" + component: "contrib" + gpg_key: "treasuredata.asc" + grafana: + url: "https://apt.grafana.com" + suite: "stable" + component: "main" + gpg_key: "grafana.asc" + influxdb: + url: "https://repos.influxdata.com/ubuntu" + # TODO(mnasiadka): Switch to noble when available + suite: "jammy" + component: "stable" + gpg_key: "influxdb.asc" + mariadb: + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu" + suite: "noble" + component: "main" + gpg_key: "mariadb.gpg" + opensearch: + url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/" + suite: "stable" + component: "main" + gpg_key: "opensearch.asc" + opensearch-dashboards: + url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/" + suite: "stable" + component: "main" + gpg_key: "opensearch.asc" + proxysql: + url: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/noble/" + suite: "./" + component: "" + gpg_key: "proxysql.asc" + rabbitmq: + url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu" + suite: "noble" + component: "main" + gpg_key: "rabbitmq.gpg" + +ubuntu-aarch64: + docker-ce: + url: "{{ stackhpc_repo_docker_ce_ubuntu_noble_url }}" + suite: "noble" + component: "stable" + gpg_key: "docker-ce.asc" + erlang: + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" + suite: "noble" + component: "main" + gpg_key: "erlang-ppa.gpg" + fluentd: + url: "https://packages.treasuredata.com/lts/5/ubuntu/noble/" + suite: "noble" + component: "contrib" + gpg_key: "treasuredata.asc" + grafana: + url: "https://apt.grafana.com" + suite: "stable" + component: "main" + gpg_key: "grafana.asc" + influxdb: + url: "https://repos.influxdata.com/ubuntu" + # TODO(mnasiadka): Switch to noble when available + suite: "jammy" + component: "stable" + gpg_key: "influxdb.asc" + mariadb: + url: "https://dlm.mariadb.com/repo/mariadb-server/10.11/repo/ubuntu" + suite: "noble" + component: "main" + gpg_key: "mariadb.gpg" + opensearch: + url: "https://artifacts.opensearch.org/releases/bundle/opensearch/3.x/apt/" + suite: "stable" + component: "main" + gpg_key: "opensearch.asc" + opensearch-dashboards: + url: "https://artifacts.opensearch.org/releases/bundle/opensearch-dashboards/3.x/apt/" + suite: "stable" + component: "main" + gpg_key: "opensearch.asc" + proxysql: + url: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/noble/" + suite: "./" + component: "" + gpg_key: "proxysql.asc" + rabbitmq: + url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu" + suite: "noble" + component: "main" + arch: "amd64" + gpg_key: "rabbitmq.gpg" + +rocky: + ceph: "centos-ceph-reef" + crb: "crb" + docker-ce: "docker-ce" + epel: "epel" + erlang: "rabbitmq_rabbitmq-erlang" + extras: "extras" + fluentd: "fluent-package-lts" + grafana: "grafana" + hacluster: "highavailability" + influxdb: "influxdb" + mariadb: "mariadb" + opensearch: "opensearch-3.x" + opensearch-dashboards: "opensearch-dashboards-3.x" + openvswitch: "centos-nfv-openvswitch" + opstools: "centos-opstools" + proxysql: "proxysql" + rabbitmq: "rabbitmq_rabbitmq-server" + +rocky-aarch64: + ceph: "centos-ceph-reef" + crb: "crb" + docker-ce: "docker-ce" + epel: "epel" + erlang: "copr-rabbitmq-erlang" + extras: "extras" + fluentd: "fluent-package-lts" + grafana: "grafana" + influxdb: "influxdb" + hacluster: "highavailability" + mariadb: "mariadb" + opensearch: "opensearch-3.x" + opensearch-dashboards: "opensearch-dashboards-3.x" + openvswitch: "centos-nfv-openvswitch" + opstools: "centos-opstools" + proxysql: "proxysql" + rabbitmq: "rabbitmq_rabbitmq-server" From 272433418ae7dfed61299894aa7538285f2e4fa2 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Fri, 18 Jul 2025 13:23:15 +0200 Subject: [PATCH 2/3] [Kolla/Rocky] Use docker-ce repositories from Ark --- etc/kayobe/kolla.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index fb4b65c427..254075acfe 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -237,6 +237,9 @@ stackhpc_rocky_9_third_party_repos: - url: "{{ stackhpc_repo_almalinux_9_proxysql_2_7_url }}" file: "proxysql.repo" tag: "proxysql" + - url: "{{ stackhpc_repo_centos_stream_9_docker_url }}" + file: "docker-ce.repo" + tag: docker-ce # List of EPEL 9 stackhpc_epel_9_repos: From b05366c661fac3bdc94d03fb92969e0ec81cbe69 Mon Sep 17 00:00:00 2001 From: Grzegorz Koper Date: Thu, 14 May 2026 13:00:53 +0200 Subject: [PATCH 3/3] Add release note for docker-ce Ark repos --- .../notes/kolla-docker-ce-from-ark-e8064fa90f09ac37.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 releasenotes/notes/kolla-docker-ce-from-ark-e8064fa90f09ac37.yaml diff --git a/releasenotes/notes/kolla-docker-ce-from-ark-e8064fa90f09ac37.yaml b/releasenotes/notes/kolla-docker-ce-from-ark-e8064fa90f09ac37.yaml new file mode 100644 index 0000000000..775260e6f2 --- /dev/null +++ b/releasenotes/notes/kolla-docker-ce-from-ark-e8064fa90f09ac37.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + Docker CE repositories used during Kolla container image builds are now + served from the Ark Pulp mirror for both Ubuntu Noble and Rocky 9. The + Ubuntu repository is configured via ``etc/kayobe/kolla/repos.yaml`` and + the Rocky one via ``stackhpc_rocky_9_third_party_repos`` in + ``etc/kayobe/kolla.yml``.