Skip to content

WIP: kolla build repo config#2371

Draft
Alex-Welsh wants to merge 3 commits into
stackhpc/2026.1from
2026.1-kolla-images
Draft

WIP: kolla build repo config#2371
Alex-Welsh wants to merge 3 commits into
stackhpc/2026.1from
2026.1-kolla-images

Conversation

@Alex-Welsh

Copy link
Copy Markdown
Member

Creating this PR for discussion only right now.

The way kolla configures package repos has changed a lot in the latest release and I need to work out the best way to do it. That might require some changes to kayobe or kolla iself to expose the right variables and make this easier than it has been in previous releases.

Adds Ubuntu Noble apt repo config for building Gazpacho container
images.
@github-actions github-actions Bot added the waiting-review PR is waiting for a review label Jun 15, 2026

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code Review

This pull request removes support for Rocky 9 and introduces repository configurations and definitions for Rocky 10 and Ubuntu Noble across several files, including kolla-build.conf, repos.yaml, and stackhpc.yml. Feedback on these changes includes updating an outdated comment in kolla-build.conf that still references Rocky 9, removing repository definitions for CentOS Stream 10 and EL10 since they are not yet officially supported, and converting a multi-line gpgkey string in repos.yaml to a single-line format to avoid potential parsing errors.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment thread etc/kayobe/kolla/kolla-build.conf Outdated
Comment thread etc/kayobe/kolla/repos.yaml
Comment thread etc/kayobe/kolla/repos.yaml
Comment thread etc/kayobe/stackhpc.yml
@Alex-Welsh Alex-Welsh force-pushed the 2026.1-kolla-images branch from 69347c6 to a5816ec Compare June 15, 2026 14:46
@Alex-Welsh Alex-Welsh force-pushed the 2026.1-kolla-images branch from a5816ec to 801d341 Compare June 15, 2026 14:48
@Alex-Welsh

Copy link
Copy Markdown
Member Author

So there's basically three parts to this:

  1. Third party repos in repos.yaml - These are the easy ones, I think they should template out fine. It is basically a copy of the repos.yaml upstream, but with our repo URLs thrown in there.
  2. Base Rocky Repos - The docs say you can include your own *.repo files using rpm_setup_config but also say that the repo file must be configured in kolla/docker/base (or as a url). Looking at how kolla does this, I don't think the jinja templating in the repo file I added will work, so probably needs a patch to Kayobe to fix. I don't see another way to override base repos.
  3. Base Ubuntu Repos - Same as Rocky basically. Docs say you can override them. It doesn't say it has to be anywhere specific, but I don't think the jinja template will work. Probably needs another Kayobe patch. Again, don't see another way to override base repos.

@mnasiadka am I correct on points 2 and 3? Need check I haven't missed an obvious way to do this

@mnasiadka

Copy link
Copy Markdown
Member

So there's basically three parts to this:

  1. Third party repos in repos.yaml - These are the easy ones, I think they should template out fine. It is basically a copy of the repos.yaml upstream, but with our repo URLs thrown in there.
  2. Base Rocky Repos - The docs say you can include your own *.repo files using rpm_setup_config but also say that the repo file must be configured in kolla/docker/base (or as a url). Looking at how kolla does this, I don't think the jinja templating in the repo file I added will work, so probably needs a patch to Kayobe to fix. I don't see another way to override base repos.
  3. Base Ubuntu Repos - Same as Rocky basically. Docs say you can override them. It doesn't say it has to be anywhere specific, but I don't think the jinja template will work. Probably needs another Kayobe patch. Again, don't see another way to override base repos.

@mnasiadka am I correct on points 2 and 3? Need check I haven't missed an obvious way to do this

Basically 1 is correct, 2 and 3 can stay as a template override - we didn't get to support overriding this in repos.yaml (but that's somewhere deep on my list)

@Alex-Welsh

Copy link
Copy Markdown
Member Author

So there's basically three parts to this:

  1. Third party repos in repos.yaml - These are the easy ones, I think they should template out fine. It is basically a copy of the repos.yaml upstream, but with our repo URLs thrown in there.
  2. Base Rocky Repos - The docs say you can include your own *.repo files using rpm_setup_config but also say that the repo file must be configured in kolla/docker/base (or as a url). Looking at how kolla does this, I don't think the jinja templating in the repo file I added will work, so probably needs a patch to Kayobe to fix. I don't see another way to override base repos.
  3. Base Ubuntu Repos - Same as Rocky basically. Docs say you can override them. It doesn't say it has to be anywhere specific, but I don't think the jinja template will work. Probably needs another Kayobe patch. Again, don't see another way to override base repos.

@mnasiadka am I correct on points 2 and 3? Need check I haven't missed an obvious way to do this

Basically 1 is correct, 2 and 3 can stay as a template override - we didn't get to support overriding this in repos.yaml (but that's somewhere deep on my list)

I'd really like to kill the grim sed templating we have right now. Is there a WIP patch I can pick up?

@mnasiadka

Copy link
Copy Markdown
Member

So there's basically three parts to this:

  1. Third party repos in repos.yaml - These are the easy ones, I think they should template out fine. It is basically a copy of the repos.yaml upstream, but with our repo URLs thrown in there.
  2. Base Rocky Repos - The docs say you can include your own *.repo files using rpm_setup_config but also say that the repo file must be configured in kolla/docker/base (or as a url). Looking at how kolla does this, I don't think the jinja templating in the repo file I added will work, so probably needs a patch to Kayobe to fix. I don't see another way to override base repos.
  3. Base Ubuntu Repos - Same as Rocky basically. Docs say you can override them. It doesn't say it has to be anywhere specific, but I don't think the jinja template will work. Probably needs another Kayobe patch. Again, don't see another way to override base repos.

@mnasiadka am I correct on points 2 and 3? Need check I haven't missed an obvious way to do this

Basically 1 is correct, 2 and 3 can stay as a template override - we didn't get to support overriding this in repos.yaml (but that's somewhere deep on my list)

I'd really like to kill the grim sed templating we have right now. Is there a WIP patch I can pick up?

I did a refreshed version of the patches in this stack: https://review.opendev.org/c/openstack/kolla/+/993407

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.

2 participants