From ba0b307f7318c90ba15c364bbf60e47021b31e7a Mon Sep 17 00:00:00 2001
From: Maksim Malchuk <maksim.malchuk@gmail.com>
Date: Tue, 27 Feb 2024 22:49:13 +0300
Subject: [PATCH] Mark bifrost as buildable and build containers from correct
 tarballs

Mark bifrost as buildable since [1] is merged and new tarball
is posted [2]. Also this change fixes an issue that containers were
built from old tarballs still exist on [3].

[1]: https://review.opendev.org/c/openstack/bifrost/+/909844
[2]: https://tarballs.opendev.org/openstack/bifrost/
[3]: https://tarballs.opendev.org/openstack/

Change-Id: I7b491f54d78398dadf080532aef694301e0bbe7b
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
---
 kolla/common/config.py | 2 +-
 kolla/image/build.py   | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/kolla/common/config.py b/kolla/common/config.py
index 54fd6ba2df..cb67456f2e 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -1038,7 +1038,7 @@ def parse(conf, args, usage=None, prog=None,
     # NOTE(jeffrey4l): set the default base tag based on the
     # base option
     conf.set_default('base_tag', DEFAULT_BASE_TAGS[conf.base]['tag'])
-    prefix = '' if conf.openstack_release == 'master' else 'stable-'
+    prefix = '' if conf.openstack_release == 'master' else 'unmaintained-'
     openstack_branch = '{}{}'.format(prefix, conf.openstack_release)
     openstack_branch_slashed = openstack_branch.replace('-', '/')
     conf.set_default('openstack_branch', openstack_branch)
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 2edc64f002..8a8e2d0b02 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -99,7 +99,6 @@ UNBUILDABLE_IMAGES = {
     },
 
     'source': {
-        "bifrost-base",          # Broken on unmaintained/yoga
     },
 
     'centos': {