openstack/kolla
Code Issues Proposed changes

Mark bifrost as buildable and build containers from correct tarballs

Browse Source 
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>
This commit is contained in:
Maksim Malchuk 2024-02-27 22:49:13 +03:00
parent a876b1cca8
commit ba0b307f73
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kolla/common/config.py
View File

@ -1038,7 +1038,7 @@ def parse(conf, args, usage=None, prog=None,
# NOTE(jeffrey4l): set the default base tag based on the # NOTE(jeffrey4l): set the default base tag based on the
# base option # base option
conf.set_default('base_tag', DEFAULT_BASE_TAGS[conf.base]['tag']) 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 = '{}{}'.format(prefix, conf.openstack_release)
openstack_branch_slashed = openstack_branch.replace('-', '/') openstack_branch_slashed = openstack_branch.replace('-', '/')
conf.set_default('openstack_branch', openstack_branch) conf.set_default('openstack_branch', openstack_branch)

1
kolla/image/build.py
View File

@ -99,7 +99,6 @@ UNBUILDABLE_IMAGES = {
}, },
'source': { 'source': {
"bifrost-base", # Broken on unmaintained/yoga
}, },
'centos': { 'centos': {