diff options
| author | Maksim Malchuk <maksim.malchuk@gmail.com> | 2024-05-08 22:14:29 +0300 |
|---|---|---|
| committer | Maksim Malchuk <maksim.malchuk@gmail.com> | 2024-05-08 21:37:59 +0000 |
| commit | 3161fed77fead8d49135d000be6aef9362c67163 (patch) | |
| tree | 5a3e037eea800dc7f26d0c58bff29402cdb885a4 | |
| parent | d82f7a4460df58965f6b8eb8febbb9f3b2d37042 (diff) | |
| download | kolla-3161fed77fead8d49135d000be6aef9362c67163.tar.gz kolla-3161fed77fead8d49135d000be6aef9362c67163.zip | |
Build Bifrost containers from correct tarballs
Since [1] is merged and new tarball (bifrost-unmaintained-zed.tar.gz)
is posted [2] fix an issue that containers were built from old tarball
(bifrost-stable-zed.tar.gz) still exist on [2].
Also disable build of the Murano images due to [3].
[1]: https://review.opendev.org/c/openstack/bifrost/+/918671
[2]: https://tarballs.opendev.org/openstack/bifrost/
[3]: I3d43519c34b8775a73a311216a945cf69cd89fe4
Change-Id: I7b491f54d78398dadf080532aef694301e0bbe7b
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
| -rw-r--r-- | kolla/common/config.py | 2 | ||||
| -rw-r--r-- | kolla/image/unbuildable.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py index d9053fa79..8d175cebe 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -352,7 +352,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/unbuildable.py b/kolla/image/unbuildable.py index 5dc9ae02c..562a7db92 100644 --- a/kolla/image/unbuildable.py +++ b/kolla/image/unbuildable.py @@ -32,16 +32,19 @@ UNBUILDABLE_IMAGES = { }, 'debian': { + "murano-base", # Missing tarball image }, 'rocky': { "hacluster-pcs", # Missing crmsh package + "murano-base", # Missing tarball image "nova-spicehtml5proxy", # Missing spicehtml5 package "ovsdpdk", # Not supported on CentOS "tgtd", # Not supported on CentOS }, 'ubuntu': { + "murano-base", # Missing tarball image }, 'ubuntu+aarch64': { |