From 655fa83e4d7e34a296dbe030bdf8d7e727146f34 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Wed, 28 Apr 2021 11:07:08 +0200
Subject: [PATCH] Rename rdo-qemu-ev repo to centos-advanced-virt

Change-Id: I5c6867be7432f1a90410911325aeb8dcda74b19f
---
 manifests/repo/redhat/redhat.pp                  |  9 +++++++--
 .../openstack_extras_repo_redhat_redhat_spec.rb  | 16 +++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/manifests/repo/redhat/redhat.pp b/manifests/repo/redhat/redhat.pp
index bcdd7f3..7599fb2 100644
--- a/manifests/repo/redhat/redhat.pp
+++ b/manifests/repo/redhat/redhat.pp
@@ -156,10 +156,15 @@ class openstack_extras::repo::redhat::redhat (
       $virt_baseurl = "${centos_mirror_url}/centos/${centos_major}/virt/\$basearch/advanced-virtualization/"
     }
 
+    # TODO(tobias-urdin): Remove this after one cycle.
+    yumrepo { 'rdo-qemu-ev':
+      ensure => 'absent',
+    }
+
     $virt_hash = {
-      'rdo-qemu-ev' => {
+      'centos-advanced-virt' => {
         'baseurl' => $virt_baseurl,
-        'descr'   => "RDO CentOS-${$centos_major} - QEMU EV",
+        'descr'   => "CentOS-${$centos_major} - Advanced Virt",
         'gpgkey'  => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
       }
     }
diff --git a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
index ebbd21e..02d892d 100644
--- a/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
+++ b/spec/classes/openstack_extras_repo_redhat_redhat_spec.rb
@@ -24,6 +24,8 @@ describe 'openstack_extras::repo::redhat::redhat' do
         :require    => 'Anchor[openstack_extras_redhat]',
       )}
 
+      it { should contain_yumrepo('rdo-qemu-ev').with_ensure('absent') }
+
       it { should contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization').with(
         :source => 'puppet:///modules/openstack_extras/RPM-GPG-KEY-CentOS-SIG-Virtualization',
         :owner  => 'root',
@@ -32,9 +34,9 @@ describe 'openstack_extras::repo::redhat::redhat' do
         :before => 'Anchor[openstack_extras_redhat]',
       )}
 
-      it { should contain_yumrepo('rdo-qemu-ev').with(
+      it { should contain_yumrepo('centos-advanced-virt').with(
         :baseurl    => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}-stream/virt/$basearch/advancedvirt-common/",
-        :descr      => "RDO CentOS-#{facts[:operatingsystemmajrelease]}-stream - QEMU EV",
+        :descr      => "CentOS-#{facts[:operatingsystemmajrelease]}-stream - Advanced Virt",
         :gpgkey     => 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization',
         :enabled    => '1',
         :gpgcheck   => '1',
@@ -74,7 +76,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
       it { should_not contain_yumrepo('rdo-release') }
 
       it { should_not contain_file('/etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Virtualization') }
-      it { should_not contain_yumrepo('rdo-qemu-ev') }
+      it { should_not contain_yumrepo('centos-advanced-virt') }
 
       it { should contain_file("/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}").with(
         :source => "puppet:///modules/openstack_extras/RPM-GPG-KEY-EPEL-#{facts[:operatingsystemmajrelease]}",
@@ -123,9 +125,9 @@ describe 'openstack_extras::repo::redhat::redhat' do
         :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/cloud/\$basearch/openstack-victoria/",
       )}
 
-      it { should contain_yumrepo('rdo-qemu-ev').with(
+      it { should contain_yumrepo('centos-advanced-virt').with(
         :baseurl => "http://mirror.centos.org/centos/#{facts[:operatingsystemmajrelease]}/virt/\$basearch/advanced-virtualization/",
-        :descr   => "RDO CentOS-#{facts[:operatingsystemmajrelease]} - QEMU EV",
+        :descr   => "CentOS-#{facts[:operatingsystemmajrelease]} - Advanced Virt",
       )}
     end
 
@@ -253,7 +255,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
         :baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/cloud/\$basearch/openstack-victoria/",
       )}
 
-      it { should contain_yumrepo('rdo-qemu-ev').with(
+      it { should contain_yumrepo('centos-advanced-virt').with(
         :baseurl => "http://foo.bar/centos/#{facts[:operatingsystemmajrelease]}-stream/virt/\$basearch/advancedvirt-common/",
       )}
     end
@@ -311,7 +313,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
         :before => 'Anchor[openstack_extras_redhat]',
       )}
 
-      it { should contain_yumrepo('rdo-qemu-ev').with(
+      it { should contain_yumrepo('centos-advanced-virt').with(
         :enabled    => '1',
         :gpgcheck   => '1',
         :mirrorlist => 'absent',