aboutsummaryrefslogtreecommitdiff
path: root/docker/base/Dockerfile.j2
diff options
context:
space:
mode:
authorAlfredo Moralejo <amoralej@redhat.com>2020-02-12 09:51:02 +0100
committeryatinkarel <ykarel@redhat.com>2020-03-03 16:31:53 +0530
commit0c6312968214e403b5a408d69df17bd0a9267095 (patch)
treec39544c5d626e738394a43a526fa87a8a981fe34 /docker/base/Dockerfile.j2
parent96d4e1ad3afec83de6e019a051686e05c6611c25 (diff)
downloadkolla-0c6312968214e403b5a408d69df17bd0a9267095.tar.gz
kolla-0c6312968214e403b5a408d69df17bd0a9267095.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. Change-Id: Id37dca84c4eb918aaf2d3c036ef5387fe75988dd
Diffstat (limited to 'docker/base/Dockerfile.j2')
-rw-r--r--docker/base/Dockerfile.j217
1 files changed, 3 insertions, 14 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index ef5c16105..c854f4cdf 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' %}
@@ -255,23 +253,14 @@ RUN export CEPH_MASTER_REPO=$(curl -s https://shaman.ceph.com/api/search/\?statu
{% endif %}
{% set base_centos_yum_repos_to_disable = [
+ 'centos-ceph-nautilus',
+ 'centos-nfs-ganesha28',
'influxdb',
] %}
-# FIXME(mgoddard): Not available for CentOS 8 yet.
{% if distro_package_manager == 'yum' %}
{% set base_centos_yum_repos_to_disable = base_centos_yum_repos_to_disable + [
- 'centos-ceph-nautilus',
- '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) }} \