From cf47864ab1e4fa6192ea96727d01b3e935b7a1fc Mon Sep 17 00:00:00 2001
From: Giulio Fidente <gfidente@redhat.com>
Date: Tue, 18 Jun 2019 17:04:55 +0200
Subject: Move back to CentOS StorageSIG repos for Ceph and Ganesha

Recently a new repo was created in CentOS to distribute Ganesha,
and the repo made a dependency of the Ceph Nautilus repo package [1]

When centos-release-ceph-nautilus 1.2-1 will go out, it should not
be necessary to disable the CentOS Ceph repos pulled in by
dependency of the RDO repositories, as done in [2]

1. https://github.com/CentOS-Storage-SIG/centos-release-ceph/commit/f1a17c9d145cabfa1dfd3102fe7e2fc584f6a907
2. https://review.opendev.org/#/c/651601/

Change-Id: I6bf0cbfaffc22147c5bec03b5897719de53366ed
---
 docker/base/Dockerfile.j2 |  6 ++++--
 docker/base/ceph.repo     | 21 ---------------------
 2 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 docker/base/ceph.repo

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 7126d7c33..b93e378f9 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -75,7 +75,6 @@ COPY yum.conf /etc/yum.conf
 
 {% if base_arch == 'x86_64' %}
     {% set base_yum_repo_files = [
-        'ceph.repo',
         'elasticsearch.repo',
         'grafana.repo',
         'influxdb.repo',
@@ -95,7 +94,6 @@ COPY yum.conf /etc/yum.conf
     ] %}
 {% elif base_arch == 'aarch64' %}
     {% set base_yum_repo_files = [
-        'ceph.repo',
         'grafana.repo'
     ] %}
 
@@ -143,10 +141,12 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7
 
 {% set base_centos_yum_repo_keys = [
     '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-OpsTools',
+    '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage',
     '/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization'
 ] %}
 
 {% set base_centos_yum_repo_packages = [
+    'centos-release-ceph-nautilus',
     'centos-release-opstools',
     'centos-release-qemu-ev',
     'epel-release',
@@ -195,6 +195,8 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \
 COPY oraclelinux-extras.repo /etc/yum.repos.d/oraclelinux-extras.repo
 RUN {{ macros.install_packages( ['tar', 'yum-utils', 'https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm' ], chain=True, clean=False) }} \
     && rpm -Uvh --nodeps \
+        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-nfs-ganesha28-1.0-2.el7.centos.noarch.rpm \
+        http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-ceph-nautilus-1.2-2.el7.centos.noarch.rpm \
         http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-opstools-1-8.el7.noarch.rpm \
         http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-qemu-ev-1.0-3.el7.centos.noarch.rpm \
         http://mirror.centos.org/centos-7/7/extras/x86_64/Packages/centos-release-virt-common-1-1.el7.centos.noarch.rpm \
diff --git a/docker/base/ceph.repo b/docker/base/ceph.repo
deleted file mode 100644
index ebe8486e3..000000000
--- a/docker/base/ceph.repo
+++ /dev/null
@@ -1,21 +0,0 @@
-[ceph]
-name=ceph
-baseurl=https://download.ceph.com/rpm-nautilus/el7/$basearch
-enabled=1
-gpgcheck=1
-gpgkey=https://download.ceph.com/keys/release.asc
-
-[ceph-noarch]
-name=Ceph noarch packages
-baseurl=https://download.ceph.com/rpm-nautilus/el7/noarch
-enabled=1
-priority=2
-gpgcheck=1
-gpgkey=https://download.ceph.com/keys/release.asc
-
-[nfs_ganesha]
-baseurl = http://download.ceph.com/nfs-ganesha/rpm-V2.7-stable/nautilus/$basearch
-gpgcheck = 1
-gpgkey = https://download.ceph.com/keys/release.asc
-name = nfs-ganesha stable repo
-skip_if_unavailable = 1
-- 
cgit v1.2.3