aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2023-06-14 13:54:53 +0200
committerMarcin Juszkiewicz <marcin.juszkiewicz+kolla@linaro.org>2023-06-22 11:49:50 +0200
commitd88074b6238510daf9b0800efa27d7caccd7f080 (patch)
treed7fe789a12f2dc7b167d8795a8aad06552a4dcfb
parent427c8b66aafe65d051afd15f5cb82b60298860d5 (diff)
downloadkolla-d88074b6238510daf9b0800efa27d7caccd7f080.tar.gz
kolla-d88074b6238510daf9b0800efa27d7caccd7f080.zip
config: switch OpenStack release back to master
2023.1 'Antelope' has stable/ branch so we can go back to master. rocky/centos: mark bifrost unbuildable - EPEL issues - will be fixed separately Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/886395 Change-Id: I523e7465c3cf87ae4ee3fd16b3a79ddb0b707b37
-rw-r--r--kolla/common/config.py2
-rw-r--r--kolla/image/unbuildable.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 86bdcf230..d8eb6846e 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -36,7 +36,7 @@ DISTRO_PRETTY_NAME = {
'rocky': 'Rocky Linux 9.* (Blue Onyx)',
'ubuntu': 'Ubuntu 22.04',
}
-OPENSTACK_RELEASE = '2023.1'
+OPENSTACK_RELEASE = 'master'
# This is noarch repository so we will use it on all architectures
DELOREAN_DEPS = ""
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py
index 9ead6ef52..4eb505f47 100644
--- a/kolla/image/unbuildable.py
+++ b/kolla/image/unbuildable.py
@@ -25,6 +25,7 @@ UNBUILDABLE_IMAGES = {
# Issues for SHA1 keys:
# https://github.com/grafana/grafana/issues/41036
'centos': {
+ "bifrost-base", # EPEL-related breakage
"gnocchi-base", # https://github.com/gnocchixyz/gnocchi/issues/1304 # noqa
"hacluster-pcs", # Missing crmsh package
"nova-spicehtml5proxy", # Missing spicehtml5 package
@@ -37,6 +38,7 @@ UNBUILDABLE_IMAGES = {
},
'rocky': {
+ "bifrost-base", # EPEL-related breakage
"gnocchi-base", # https://github.com/gnocchixyz/gnocchi/issues/1304 # noqa
"hacluster-pcs", # Missing crmsh package
"nova-spicehtml5proxy", # Missing spicehtml5 package