Skip to content

[Kolla] Use docker-ce repos from ark #1779

Open
grzegorzkoper wants to merge 3 commits into
stackhpc/2025.1from
kolla_use_docker_ce_from_ark_repos_yaml
Open

[Kolla] Use docker-ce repos from ark #1779
grzegorzkoper wants to merge 3 commits into
stackhpc/2025.1from
kolla_use_docker_ce_from_ark_repos_yaml

Conversation

@grzegorzkoper
Copy link
Copy Markdown
Contributor

No description provided.

Copy link
Copy Markdown
Member

@Alex-Welsh Alex-Welsh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we can remove the hacky edits for apt kolla.yml?

also needs a reno

@grzegorzkoper
Copy link
Copy Markdown
Contributor Author

So we can remove the hacky edits for apt kolla.yml?

also needs a reno

Looks like we can, better to test it first :D Trade off is we need to maintain repos.yaml, preferably point what repos we can to Ark ?

I've started looking at resurrecting https://review.opendev.org/c/openstack/kolla/+/909879, which would let us remove the hacky edits for rpm too .

@grzegorzkoper
Copy link
Copy Markdown
Contributor Author

@priteau Refreshed, rebased onto stackhpc/2025.1 (no conflicts) and added a reno.

@Alex-Welsh Reno added.

On the apt hacks question: I think the proper fix is to move the base Ubuntu + UCA repos out of /etc/apt/sources.list blob in kolla_build_blocks and into etc/kayobe/kolla/repos.yaml. Then we can drop the rm -f /etc/apt/sources.list* shell. That's a fair bit larger than this change though, so I'd rather do it as a follow-up to keep this PR small and mergeable.

On the Rocky side we can also normalise to the dict form (url: + gpg_key:) but https://review.opendev.org/c/openstack/kolla/+/909879 will not be backported to 2025.1 so this would need to wait for 2025.2 (or 2026.1) to catch-up.

Happy to do a follow-up if that sounds reasonable.

@Alex-Welsh Alex-Welsh force-pushed the kolla_use_docker_ce_from_ark_repos_yaml branch from c251414 to b05366c Compare May 22, 2026 15:57
@Alex-Welsh Alex-Welsh added waiting-review PR is waiting for a review and removed size: m labels May 22, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

waiting-review PR is waiting for a review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants