From ac65fd73540d8738013f9fa0f8ae50329d38881b Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: Jun 04 2020 14:16:47 +0000
Subject: Rely on ceph nautilus release rpm instead of ceph repo


centos-release-ceph-nautilus rpm is now available so
let's rely on it instead of carrying ceph repo in centos
release-ussuri rpm.

---

diff --git a/SOURCES/ceph-nautilus.repo b/SOURCES/ceph-nautilus.repo
deleted file mode 100644
index 73044df..0000000
--- a/SOURCES/ceph-nautilus.repo
+++ /dev/null
@@ -1,9 +0,0 @@
-[ceph-nautilus]
-name=CentOS-8 - Ceph Nautilus
-#baseurl=http://mirror.centos.org/centos/$releasever/storage/$basearch/ceph-nautilus
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=storage-ceph-nautilus
-gpgcheck=1
-enabled=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Storage
-module_hotfixes=1
-
diff --git a/SPECS/centos-release-openstack.spec b/SPECS/centos-release-openstack.spec
index fa3b006..1255881 100644
--- a/SPECS/centos-release-openstack.spec
+++ b/SPECS/centos-release-openstack.spec
@@ -2,20 +2,19 @@
 Summary: OpenStack from the CentOS Cloud SIG repo configs
 Name: centos-release-openstack-%{OpenStackVersion}
 Version: 1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://wiki.centos.org/SpecialInterestGroup/Cloud
 Source0: CentOS-OpenStack.repo
 Source1: RPM-GPG-KEY-CentOS-SIG-Cloud
 Source2: RPM-GPG-KEY-CentOS-SIG-Virtualization-RDO
 Source3: advanced-virtualization.repo
-Source4: ceph-nautilus.repo
 
 BuildArch: noarch
 
 Requires: centos-release
 Requires: centos-release-rabbitmq-38
-Requires: centos-release-storage-common
+Requires: centos-release-ceph-nautilus
 Conflicts: centos-release-openstack
 
 %description
@@ -31,7 +30,6 @@ install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 
 install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d
-install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/yum.repos.d
 
 %files
 %defattr(-,root,root)
@@ -39,6 +37,9 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/yum.repos.d
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
+* Thu Jun 04 2020  - %{OpenStackVersion}-1-2
+- Rely on ceph nautilus release rpm instead of ceph repo
+
 * Mon May 18 2020 Yatin Karel <ykarel@redhat.com> - %{OpenStackVersion}-1-1
 - Ussuri release