From d9a4b6cfa946e66f6304c06e6fc27a5c7b72d56c Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 6 Aug 2025 10:36:11 +0200
Subject: [PATCH] debian: Use {{ openstack_release_codename }} for extrepo

Change-Id: I5e89a9a241f746a2cbab723ea5fc57ea65ad5ee5
Signed-off-by: Michal Nasiadka <mnasiadka@gmail.com>
---
 docker/base/Dockerfile.j2   | 2 +-
 kolla/common/config.py      | 7 +++++++
 kolla/image/kolla_worker.py | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 0191de53a2..3bce2e0426 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -253,7 +253,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 d2984d7ec1..6009112a65 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -37,7 +37,11 @@ DISTRO_PRETTY_NAME = {
     'rocky': 'Rocky Linux 9.* (Blue Onyx)',
     '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 3a78a7f35b..723914f5a5 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,