From 6df9ff0c46bfc6caf7e39ba96a41209dca44ce4e Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Wed, 12 Feb 2020 09:51:02 +0100 Subject: Use StorageSIG repos for Ceph in CentOS8 Storage SIG has built Ceph Nautilus and Ganesha for CentOS8 in CentOS Build System. Let's switch to use them in kolla. Depends-On: https://review.opendev.org/711214 Change-Id: Id37dca84c4eb918aaf2d3c036ef5387fe75988dd (cherry picked from commit 0c6312968214e403b5a408d69df17bd0a9267095) --- docker/base/Dockerfile.j2 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'docker/base/Dockerfile.j2') diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 651f29601..99bfbc36e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -235,9 +235,7 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 ] %} # FIXME(mnasiadka): Replace with CentOS Storage SIG packages when avail {% else %} -COPY ceph_master.repo /etc/yum.repos.d/ -RUN export CEPH_MASTER_REPO=$(curl -s https://shaman.ceph.com/api/search/\?status\=ready\&project\=ceph\&ref\=master\&flavor\=default\&distros\=centos/8\&sha1\=\latest | awk -F'{|: |,|"|}' '{for(i=1;i<=NF;i++) {gsub(" ",""); if($i == "url") {print $(i+2)}}}') \ - && sed -i "s|CHACRA_URL|${CEPH_MASTER_REPO}|g" /etc/yum.repos.d/ceph_master.repo +COPY ceph.repo /etc/yum.repos.d/ {% endif %} {% if distro_package_manager == 'dnf' %} -- cgit v1.2.3