diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2020-01-27 14:57:57 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-02-26 11:58:51 +0000 |
| commit | f367d2303f3fe22cdd9ce55b20dd77918676ab36 (patch) | |
| tree | c193a324c89904efea13f1199ebb116051c3163e /docker | |
| parent | 27ed7f231d15a01d0bd8b62c557ab5f5875289c2 (diff) | |
| download | kolla-f367d2303f3fe22cdd9ce55b20dd77918676ab36.tar.gz kolla-f367d2303f3fe22cdd9ce55b20dd77918676ab36.zip | |
CentOS 8: Use upstream Ceph/master
The only Ceph version that will support CentOS 8 is Octopus.
It will be released end of March 2020 - so for now let's use master.
Change-Id: I5955acb41e7346802d76f4f2b244cbf5c36f5bf2
Partially-Implements: blueprint centos-rhel-8
(cherry picked from commit 70423f19596f92ed01c89e7d62f8c46a6dba6a23)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/base/ceph_master.repo | 32 |
2 files changed, 37 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 357f1da1f..651f29601 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -233,6 +233,11 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 'centos-release-opstools', 'centos-release-qemu-ev', ] %} +# 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 {% endif %} {% if distro_package_manager == 'dnf' %} diff --git a/docker/base/ceph_master.repo b/docker/base/ceph_master.repo new file mode 100644 index 000000000..1b9296ebc --- /dev/null +++ b/docker/base/ceph_master.repo @@ -0,0 +1,32 @@ +[ceph] +name=Ceph packages for $basearch +baseurl=CHACRA_URL/$basearch +enabled=1 +gpgcheck=0 +type=rpm-md +gpgkey=https://download.ceph.com/keys/autobuild.asc + +[ceph-noarch] +name=Ceph noarch packages +baseurl=CHACRA_URL/noarch +enabled=1 +gpgcheck=0 +type=rpm-md +gpgkey=https://download.ceph.com/keys/autobuild.asc + +[ceph-el8] +name=Copr repo for ceph-el8 owned by ktdreyer +baseurl=https://copr-be.cloud.fedoraproject.org/results/ktdreyer/ceph-el8/epel-8-$basearch/ +type=rpm-md +skip_if_unavailable=True +gpgcheck=1 +gpgkey=https://copr-be.cloud.fedoraproject.org/results/ktdreyer/ceph-el8/pubkey.gpg +repo_gpgcheck=0 +enabled=1 +enabled_metadata=1 + +[ceph-lab-extras] +name=ceph-lab-extras +baseurl=http://apt-mirror.front.sepia.ceph.com/lab-extras/8/ +enabled=1 +gpgcheck=0 |