aboutsummaryrefslogtreecommitdiff
path: root/kolla
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2024-12-11 10:05:02 +0000
committerGerrit Code Review <review@openstack.org>2024-12-11 10:05:02 +0000
commit33f5eb260bf1828bca83344bf9de654c1577e0be (patch)
tree16f5f03c23fc07ce3117637d1f46232f90fed7fc /kolla
parentf57457f90631634e92829ba149233fb3b1e929f9 (diff)
parent08a97807be4a4ba20c7897c82407ca87df53dee3 (diff)
downloadkolla-33f5eb260bf1828bca83344bf9de654c1577e0be.tar.gz
kolla-33f5eb260bf1828bca83344bf9de654c1577e0be.zip
Merge "Revert "CentOS/Rocky: use CentOS Cloud SIG repo instead of Delorean (Dalmatian)""
Diffstat (limited to 'kolla')
-rw-r--r--kolla/common/config.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 3075052ad..92b4d5a93 100644
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -39,6 +39,10 @@ DISTRO_PRETTY_NAME = {
}
OPENSTACK_RELEASE = '2024.2'
+# This is noarch repository so we will use it on all architectures
+DELOREAN_DEPS = "https://trunk.rdoproject.org/centos9-master/" \
+ "delorean-deps.repo"
+
# TODO(mandre) check for file integrity instead of downloading from an HTTPS
# source
TARBALLS_BASE = "https://tarballs.opendev.org"
@@ -280,7 +284,7 @@ _BASE_OPTS = [
help=('Set the package type of the distro. If not set then '
'the packaging type is set to "rpm" if a RHEL based '
'distro and "deb" if a Debian based distro.')),
- cfg.ListOpt('rpm_setup_config', default=[],
+ cfg.ListOpt('rpm_setup_config', default=[DELOREAN_DEPS],
help=('Comma separated list of .rpm or .repo file(s) '
'or URL(s) to install before building containers')),
cfg.StrOpt('apt_sources_list', help=('Path to custom sources.list')),