diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-31 19:26:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-31 19:26:02 +0000 |
| commit | d00fa3a6dda3914e66ed414ef758bf2aeda2906c (patch) | |
| tree | 5facd4fc0e5dd104daec8656d2be08eee701157f /docker/base/Dockerfile.j2 | |
| parent | c1d1a65a5ba9d25abd02c52bb00d8b6b5c4797a0 (diff) | |
| parent | 70423f19596f92ed01c89e7d62f8c46a6dba6a23 (diff) | |
| download | kolla-d00fa3a6dda3914e66ed414ef758bf2aeda2906c.tar.gz kolla-d00fa3a6dda3914e66ed414ef758bf2aeda2906c.zip | |
Merge "CentOS 8: Use upstream Ceph/master"
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 36223cd56..41d16c708 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -231,6 +231,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' %} @@ -257,6 +262,14 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 'centos-nfs-ganesha28', 'centos-qemu-ev', ] %} +{% else %} + # FIXME(mgoddard): Remove when CentOS Storage SIG repo is available for CentOS 8 + {% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [ + 'ceph', + 'ceph-noarch', + 'ceph-el8', + 'ceph-lab-extras', + ] %} {% endif %} RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \ |