From 0f43dfc592b5686e5e3320784e9ebf1b96b681ea Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 5 Jun 2018 15:34:44 +0200 Subject: centos: use DELOREAN repo directly on all architectures CentOS 7.5 added 'contentdir' variable to yum package manager. We handle it already in Kolla. RDO team started using it in DELOREAN repo file so we can use it directly on all architectures. Change-Id: I59fa4d3fdbd0d0e2ed52c2725684c0033451e232 --- docker/base/aarch64-cbs.repo | 15 --------------- kolla/common/config.py | 13 ++----------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/docker/base/aarch64-cbs.repo b/docker/base/aarch64-cbs.repo index 006f30fd7..6986b886f 100644 --- a/docker/base/aarch64-cbs.repo +++ b/docker/base/aarch64-cbs.repo @@ -9,18 +9,3 @@ name=CentOS Storage SIG repo with Ceph Luminous baseurl=https://buildlogs.centos.org/centos/7/storage/aarch64/ceph-luminous/ enabled=1 gpgcheck=0 - -# those below are from delorean-deps.repo used by x86-64 -# + s/centos/altarch/ for kvm-common repo - -[aarch64-kvm-common] -name=CentOS Virt SIG repo -baseurl=http://mirror.centos.org/altarch/7/virt/aarch64/kvm-common/ -enabled=1 -gpgcheck=0 - -[delorean-queens-testing] -name=dlrn-queens-testing -baseurl=https://trunk.rdoproject.org/centos7-master/deps/latest/ -enabled=1 -gpgcheck=0 diff --git a/kolla/common/config.py b/kolla/common/config.py index f9116a631..b467a430d 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -39,15 +39,7 @@ DISTRO_RELEASE = { # This is noarch repository so we will use it on all architectures DELOREAN = \ "https://trunk.rdoproject.org/centos7/current-passed-ci/delorean.repo" - -# TODO(hrw): with move to Pike+1 we need to make sure that aarch64 repo -# gets updated (docker/base/aarch64-cbs.repo file) -# there is ongoing work to sort that out -DELOREAN_DEPS = { - 'x86_64': "https://trunk.rdoproject.org/centos7/delorean-deps.repo", - 'aarch64': "", - 'ppc64le': "https://trunk.rdoproject.org/centos7/delorean-deps.repo" -} +DELOREAN_DEPS = "https://trunk.rdoproject.org/centos7/delorean-deps.repo" INSTALL_TYPE_CHOICES = ['binary', 'source', 'rdo', 'rhos'] @@ -270,8 +262,7 @@ _BASE_OPTS = [ cfg.StrOpt('maintainer', default='Kolla Project (https://launchpad.net/kolla)', help='Content of the maintainer label'), - cfg.ListOpt('rpm_setup_config', default=[DELOREAN, - DELOREAN_DEPS[hostarch]], + cfg.ListOpt('rpm_setup_config', default=[DELOREAN, 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')), -- cgit v1.2.3