diff options
| author | Zuul <zuul@review.opendev.org> | 2025-10-06 14:17:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2025-10-06 14:17:59 +0000 |
| commit | ccaf00b93663fceb56571c8920b549a58c3603d2 (patch) | |
| tree | 1d89a5fa4f397059b6b34141a4575852f8922e84 | |
| parent | f758ac96eaaa06f2f05f2673007adf8f0c08e97f (diff) | |
| parent | d9a4b6cfa946e66f6304c06e6fc27a5c7b72d56c (diff) | |
| download | kolla-ccaf00b93663fceb56571c8920b549a58c3603d2.tar.gz kolla-ccaf00b93663fceb56571c8920b549a58c3603d2.zip | |
Merge "debian: Use {{ openstack_release_codename }} for extrepo"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | kolla/common/config.py | 7 | ||||
| -rw-r--r-- | kolla/image/kolla_worker.py | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 3ea1e5bc6..40fb6f92c 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -209,7 +209,7 @@ COPY sources.list /etc/apt/sources.list.d/kolla-custom.list RUN apt update \ && apt install -y --no-install-recommends extrepo \ - && extrepo enable openstack_epoxy \ + && extrepo enable openstack_{{ openstack_release_codename | lower }} \ && apt purge -y extrepo \ && apt --purge autoremove -y \ && apt clean diff --git a/kolla/common/config.py b/kolla/common/config.py index 83b0cb922..2ec2194ac 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -37,7 +37,11 @@ DISTRO_PRETTY_NAME = { 'rocky': 'Rocky Linux 10.* (Red Quartz)', 'ubuntu': 'Ubuntu 24.04.* LTS', } + OPENSTACK_RELEASE = '2025.2' +# NOTE(mnasiadka): Using Epoxy here, since Debian OpenStack builds Flamingo +# only for Trixie +OPENSTACK_RELEASE_CODENAME = 'Epoxy' # TODO(mandre) check for file integrity instead of downloading from an HTTPS # source @@ -242,6 +246,9 @@ _CLI_OPTS = [ cfg.StrOpt('openstack-release', default=OPENSTACK_RELEASE, help='OpenStack release for building kolla source images and ' 'kolla-toolbox image'), + cfg.StrOpt('openstack-release-codename', + default=OPENSTACK_RELEASE_CODENAME, + help='OpenStack release codename for Debian OpenStack extrepo'), cfg.StrOpt('openstack-branch', help='Branch for source images (internal; with a dash; ' 'please set openstack-release instead)'), diff --git a/kolla/image/kolla_worker.py b/kolla/image/kolla_worker.py index 3a78a7f35..723914f5a 100644 --- a/kolla/image/kolla_worker.py +++ b/kolla/image/kolla_worker.py @@ -106,6 +106,7 @@ class KollaWorker(object): self.debian_arch = 'amd64' self.images = list() self.openstack_release = conf.openstack_release + self.openstack_release_codename = conf.openstack_release_codename self.openstack_branch = conf.openstack_branch self.openstack_branch_slashed = conf.openstack_branch_slashed self.docker_healthchecks = conf.docker_healthchecks @@ -323,6 +324,8 @@ class KollaWorker(object): 'image_prefix': self.image_prefix, 'namespace': self.namespace, 'openstack_release': self.openstack_release, + 'openstack_release_codename': + self.openstack_release_codename, 'openstack_branch': self.openstack_branch, 'openstack_branch_slashed': self.openstack_branch_slashed, |