diff options
| author | Alfredo Moralejo <amoralej@redhat.com> | 2020-02-12 09:51:02 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-03-05 09:20:12 +0000 |
| commit | 6df9ff0c46bfc6caf7e39ba96a41209dca44ce4e (patch) | |
| tree | c123f122619b739b725ef8a1ef1a416e1a747c8a | |
| parent | 9f0c9a0a9fac1ad95d6ed52b61983c52f2fa5f48 (diff) | |
| download | kolla-6df9ff0c46bfc6caf7e39ba96a41209dca44ce4e.tar.gz kolla-6df9ff0c46bfc6caf7e39ba96a41209dca44ce4e.zip | |
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)
| -rw-r--r-- | docker/base/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/base/ceph.repo | 13 |
2 files changed, 14 insertions, 3 deletions
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' %} diff --git a/docker/base/ceph.repo b/docker/base/ceph.repo new file mode 100644 index 000000000..8f3399509 --- /dev/null +++ b/docker/base/ceph.repo @@ -0,0 +1,13 @@ +[centos-ceph-nautilus] +name=Ceph packages for $basearch +baseurl=https://trunk.rdoproject.org/centos8-master/deps/storage/storage8-ceph-nautilus/$basearch/ +enabled=1 +gpgcheck=0 +type=rpm-md + +[centos-nfs-ganesha28] +name=Ganesha packages for $basearch +baseurl=https://trunk.rdoproject.org/centos8-master/deps/storage/storage8-nfsganesha-28/$basearch/ +enabled=1 +gpgcheck=0 +type=rpm-md |