From bbb7c993174f57d30c7ab5cfe19f93effef76c64 Mon Sep 17 00:00:00 2001
From: yatinkarel <ykarel@redhat.com>
Date: May 18 2020 14:34:41 +0000
Subject: Create first release for OpenStack Ussuri


Also add module_hotfixes=1 in OpenStack repos.
Also cleanup centos7 specific bits as ussuri is
CentOS8 only release.

---

diff --git a/SOURCES/CentOS-OpenStack.repo b/SOURCES/CentOS-OpenStack.repo
index d38f13c..fe98fb6 100644
--- a/SOURCES/CentOS-OpenStack.repo
+++ b/SOURCES/CentOS-OpenStack.repo
@@ -11,6 +11,7 @@ gpgcheck=1
 enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
 exclude=sip,PyQt4
+module_hotfixes=1
 
 [centos-openstack-OPENSTACK_VERSION-test]
 name=CentOS- $releasever - OpenStack OPENSTACK_VERSION Testing
@@ -18,6 +19,7 @@ baseurl=https://buildlogs.centos.org/centos/$releasever/cloud/$basearch/openstac
 gpgcheck=0
 enabled=0
 exclude=sip,PyQt4
+module_hotfixes=1
 
 [centos-openstack-OPENSTACK_VERSION-debuginfo]
 name=CentOS-$releasever - OpenStack OPENSTACK_VERSION - Debug
@@ -26,6 +28,7 @@ gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
 exclude=sip,PyQt4
+module_hotfixes=1
 
 [centos-openstack-OPENSTACK_VERSION-source]
 name=CentOS-$releasever - OpenStack OPENSTACK_VERSION - Source
@@ -34,9 +37,11 @@ gpgcheck=1
 enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud
 exclude=sip,PyQt4
+module_hotfixes=1
 
 [rdo-trunk-OPENSTACK_VERSION-tested]
 name=OpenStack OPENSTACK_VERSION Trunk Tested
 baseurl=https://trunk.rdoproject.org/centos$releasever-OPENSTACK_VERSION/current-passed-ci/
 gpgcheck=0
 enabled=0
+module_hotfixes=1
diff --git a/SPECS/centos-release-openstack.spec b/SPECS/centos-release-openstack.spec
index e60fd60..fa3b006 100644
--- a/SPECS/centos-release-openstack.spec
+++ b/SPECS/centos-release-openstack.spec
@@ -1,7 +1,7 @@
-%global OpenStackVersion train
+%global OpenStackVersion ussuri
 Summary: OpenStack from the CentOS Cloud SIG repo configs
 Name: centos-release-openstack-%{OpenStackVersion}
-Version: 2
+Version: 1
 Release: 1%{?dist}
 License: GPL
 URL: http://wiki.centos.org/SpecialInterestGroup/Cloud
@@ -14,13 +14,8 @@ Source4: ceph-nautilus.repo
 BuildArch: noarch
 
 Requires: centos-release
-%if 0%{?rhel} == 7
-Requires: centos-release-qemu-ev
-Requires: centos-release-ceph-nautilus
-%else
 Requires: centos-release-rabbitmq-38
 Requires: centos-release-storage-common
-%endif
 Conflicts: centos-release-openstack
 
 %description
@@ -34,11 +29,9 @@ sed -i -e "s/OPENSTACK_VERSION/%{OpenStackVersion}/g" %{buildroot}%{_sysconfdir}
 install -p -d %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 install -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/pki/rpm-gpg
 
-%if 0%{?rhel} == 8
 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
-%endif
 
 %files
 %defattr(-,root,root)
@@ -46,6 +39,9 @@ install -p -m 644 %{SOURCE4} %{buildroot}%{_sysconfdir}/yum.repos.d
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
+* Mon May 18 2020 Yatin Karel <ykarel@redhat.com> - %{OpenStackVersion}-1-1
+- Ussuri release
+
 * Wed Apr 22 2020 Alfredo Moralejo <amoralej@redhat.com> - %{OpenStackVersion}-2-1
 - Add support for CentOS 8