summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kolla/common/config.py2
-rw-r--r--kolla/image/unbuildable.py3
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': {