diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-06 14:46:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-06 14:46:38 +0000 |
| commit | 98d1f244873bec0f77df2b20492b80ac4f263c52 (patch) | |
| tree | 72323f8b71c749a64d15a6ef656c46810e3cf9e0 /docker | |
| parent | 0520217124e4e76e91f1844d08832acf501a2ebc (diff) | |
| parent | 6df9ff0c46bfc6caf7e39ba96a41209dca44ce4e (diff) | |
| download | kolla-98d1f244873bec0f77df2b20492b80ac4f263c52.tar.gz kolla-98d1f244873bec0f77df2b20492b80ac4f263c52.zip | |
Merge "Use StorageSIG repos for Ceph in CentOS8" into stable/train
Diffstat (limited to 'docker')
| -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 24158a5e4..f2a7f251a 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 |