openstack/kolla
Code Issues Proposed changes

Merge "Use StorageSIG repos for Ceph in CentOS8" into stable/train

Browse Source
This commit is contained in:
Zuul 2020-03-06 14:46:38 +00:00 committed by Gerrit Code Review
commit 98d1f24487
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/base/Dockerfile.j2
View File

@ -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' %}

13
docker/base/ceph.repo Normal file
View File

@ -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