From c51165e30259dd3ca05466e77544b1fdd401e85f Mon Sep 17 00:00:00 2001 From: Joel Capitao Date: Jan 11 2022 09:13:35 +0000 Subject: Remove the logic to identify CL8 or CS8 As discussed in [1], we can remove the logic. This fixes [2]. [1] https://lists.centos.org/pipermail/centos-devel/2022-January/120126.html [2] https://pagure.io/centos-sig-cloud/sig/issue/2 --- diff --git a/SOURCES/CentOS-OpenStack.repo b/SOURCES/CentOS-OpenStack.repo index ce46478..98f7eca 100644 --- a/SOURCES/CentOS-OpenStack.repo +++ b/SOURCES/CentOS-OpenStack.repo @@ -5,8 +5,8 @@ [centos-openstack-OPENSTACK_VERSION] name=CentOS-$releasever - OpenStack OPENSTACK_VERSION -#baseurl=http://mirror.centos.org/$contentdir/$cloudsigdist/cloud/$basearch/openstack-OPENSTACK_VERSION/ -mirrorlist=http://mirrorlist.centos.org/?release=$cloudsigdist&arch=$basearch&repo=cloud-openstack-OPENSTACK_VERSION +#baseurl=http://mirror.centos.org/$contentdir/8-stream/cloud/$basearch/openstack-OPENSTACK_VERSION/ +mirrorlist=http://mirrorlist.centos.org/?release=8-stream&arch=$basearch&repo=cloud-openstack-OPENSTACK_VERSION gpgcheck=1 enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud @@ -14,7 +14,7 @@ module_hotfixes=1 [centos-openstack-OPENSTACK_VERSION-test] name=CentOS-$releasever - OpenStack OPENSTACK_VERSION Testing -baseurl=https://buildlogs.centos.org/centos/$cloudsigdist/cloud/$basearch/openstack-OPENSTACK_VERSION/ +baseurl=https://buildlogs.centos.org/centos/8-stream/cloud/$basearch/openstack-OPENSTACK_VERSION/ gpgcheck=0 enabled=0 module_hotfixes=1 @@ -29,7 +29,7 @@ module_hotfixes=1 [centos-openstack-OPENSTACK_VERSION-source] name=CentOS-$releasever - OpenStack OPENSTACK_VERSION - Source -baseurl=http://vault.centos.org/centos/$cloudsigdist/cloud/Source/openstack-OPENSTACK_VERSION/ +baseurl=http://vault.centos.org/centos/8-stream/cloud/Source/openstack-OPENSTACK_VERSION/ gpgcheck=1 enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud diff --git a/SPECS/centos-release-openstack.spec b/SPECS/centos-release-openstack.spec index c71581d..508f581 100644 --- a/SPECS/centos-release-openstack.spec +++ b/SPECS/centos-release-openstack.spec @@ -2,7 +2,7 @@ Summary: OpenStack from the CentOS Cloud SIG repo configs Name: centos-release-openstack-%{OpenStackVersion} Version: 1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL URL: http://wiki.centos.org/SpecialInterestGroup/Cloud Source0: CentOS-OpenStack.repo @@ -29,27 +29,15 @@ 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 -%post -if [ -f /etc/os-release ]; then - source /etc/os-release -fi -if [[ $ID == 'centos' && $NAME == *'Stream' ]] || [ $ID != 'centos' ]; then - echo "8-stream" > /etc/dnf/vars/cloudsigdist -else - echo "8" > /etc/dnf/vars/cloudsigdist -fi - -%postun -if [ $1 -eq 0 ] ; then - rm -f /etc/dnf/vars/cloudsigdist -fi - %files %defattr(-,root,root) %config(noreplace) %{_sysconfdir}/yum.repos.d/* %{_sysconfdir}/pki/rpm-gpg %changelog +* Tue Jan 11 2022 Joel Capitao - %{OpenStackVersion}-1-6 +- Remove the logic to identify CL8 or CS8 + * Mon Mar 08 2021 Alfredo Moralejo - %{OpenStackVersion}-1-5 - Add support for CentOS Stream 8 repos - Use centos-release-advanced-virtualization for Advanced Virtulazation repo