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

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/
+COPY ceph.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' %}
@@ -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) }} \

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=0
+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=0
+gpgcheck=0
+type=rpm-md

docker/base/ceph_master.repo

@@ -1,32 +0,0 @@
-[ceph]
-name=Ceph packages for $basearch
-baseurl=CHACRA_URL/$basearch
-enabled=0
-gpgcheck=0
-type=rpm-md
-gpgkey=https://download.ceph.com/keys/autobuild.asc
-
-[ceph-noarch]
-name=Ceph noarch packages
-baseurl=CHACRA_URL/noarch
-enabled=0
-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=0
-enabled_metadata=1
-
-[ceph-lab-extras]
-name=ceph-lab-extras
-baseurl=http://apt-mirror.front.sepia.ceph.com/lab-extras/8/
-enabled=0
-gpgcheck=0

docker/cinder/cinder-base/Dockerfile.j2

@@ -9,12 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='cinder') }}
 
-# FIXME(mnasiadka): Remove when CentOS Storage SIG repo is available for CentOS 8
+{{ macros.enable_extra_repos(['ceph']) }}
-{% if distro_package_manager == 'dnf' %}
-    {{ macros.enable_extra_repos(['ceph', 'ceph-noarch', 'ceph-el8', 'ceph-lab-extras']) }}
-{% else %}
-    {{ macros.enable_extra_repos(['ceph']) }}
-{% endif %}
 
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}

docker/glance/glance-base/Dockerfile.j2

@@ -9,12 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='glance') }}
 
-# FIXME(mnasiadka): Remove when CentOS Storage SIG repo is available for CentOS 8
+{{ macros.enable_extra_repos(['ceph']) }}
-{% if distro_package_manager == 'dnf' %}
-    {{ macros.enable_extra_repos(['ceph', 'ceph-noarch', 'ceph-el8', 'ceph-lab-extras']) }}
-{% else %}
-    {{ macros.enable_extra_repos(['ceph']) }}
-{% endif %}
 
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}

docker/gnocchi/gnocchi-base/Dockerfile.j2

@@ -9,12 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='gnocchi') }}
 
-# FIXME(mnasiadka): Remove when CentOS Storage SIG repo is available for CentOS 8
+{{ macros.enable_extra_repos(['ceph']) }}
-{% if distro_package_manager == 'dnf' %}
-    {{ macros.enable_extra_repos(['ceph', 'ceph-noarch', 'ceph-el8', 'ceph-lab-extras']) }}
-{% else %}
-    {{ macros.enable_extra_repos(['ceph']) }}
-{% endif %}
 
 {% if install_type == 'binary' %}
 

docker/manila/manila-share/Dockerfile.j2

@@ -7,12 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-# FIXME(mnasiadka): Remove when CentOS Storage SIG repo is available for CentOS 8
+{{ macros.enable_extra_repos(['ceph']) }}
-{% if distro_package_manager == 'dnf' %}
-    {{ macros.enable_extra_repos(['ceph', 'ceph-noarch', 'ceph-el8', 'ceph-lab-extras']) }}
-{% else %}
-    {{ macros.enable_extra_repos(['ceph']) }}
-{% endif %}
 
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}

docker/nova/nova-compute/Dockerfile.j2

@@ -7,12 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-# FIXME(mnasiadka): Remove when CentOS Storage SIG repo is available for CentOS 8
+{{ macros.enable_extra_repos(['ceph']) }}
-{% if distro_package_manager == 'dnf' %}
-    {{ macros.enable_extra_repos(['ceph', 'ceph-noarch', 'ceph-el8', 'ceph-lab-extras']) }}
-{% else %}
-    {{ macros.enable_extra_repos(['ceph']) }}
-{% endif %}
 
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}

docker/nova/nova-libvirt/Dockerfile.j2

@@ -9,12 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='nova', groups='qemu') }}
 
-# FIXME(mnasiadka): Remove when CentOS Storage SIG repo is available for CentOS 8
+{{ macros.enable_extra_repos(['ceph']) }}
-{% if distro_package_manager == 'dnf' %}
-    {{ macros.enable_extra_repos(['ceph', 'ceph-noarch', 'ceph-el8', 'ceph-lab-extras']) }}
-{% else %}
-    {{ macros.enable_extra_repos(['ceph']) }}
-{% endif %}
 
 {% if base_package_type == 'rpm' %}
 

docker/zun/zun-compute/Dockerfile.j2

@@ -7,12 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-# FIXME(mnasiadka): Remove when CentOS Storage SIG repo is available for CentOS 8
+{{ macros.enable_extra_repos(['ceph']) }}
-{% if distro_package_manager == 'dnf' %}
-    {{ macros.enable_extra_repos(['ceph', 'ceph-noarch', 'ceph-el8', 'ceph-lab-extras']) }}
-{% else %}
-    {{ macros.enable_extra_repos(['ceph']) }}
-{% endif %}
 
 {% if install_type == 'binary' %}
 

kolla/template/repos.yaml

@@ -39,10 +39,8 @@ centos-ppc64le:
 
 # TODO(mnasiadka): Rework the repo list once Ceph Octopus is released
 centos8:
-  ceph: "ceph"
+  ceph: "centos-ceph-nautilus"
-  ceph-noarch: "ceph-noarch"
+  nfs-ganesha: "centos-nfs-ganesha28"
-  ceph-el8: "ceph-el8"
-  ceph-lab-extras: "ceph-lab-extras"
   epel: "epel"
   epel-modular: "epel-modular"
   grafana: "grafana"