From 3ea0150dd18aa7b46d69b37c2881abf1893c559e Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 3 Aug 2025 03:26:19 +0900
Subject: [PATCH] Fix outdated package names to be excluded from EPEL

All python packages are now prefixed by python3-, not python-.

Also python-ceph-compat no longer exists.

Change-Id: I324c1026513ce5ab732a966237418ef6f47e502e
Signed-off-by: Takashi Kajinami <kajinamit@oss.nttdata.com>
---
 manifests/repo.pp              |  2 +-
 spec/classes/ceph_repo_spec.rb | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/manifests/repo.pp b/manifests/repo.pp
index 87d14d5d..dcc3357c 100644
--- a/manifests/repo.pp
+++ b/manifests/repo.pp
@@ -164,7 +164,7 @@ not on ${facts['os']['name']}, which can lead to packaging issues.")
           mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-${el}&arch=\$basearch",
           priority   => '20', # prefer ceph repos over EPEL
           tag        => 'ceph',
-          exclude    => 'python-ceph-compat python-rbd python-rados python-cephfs',
+          exclude    => 'python3-rbd python3-rados python3-cephfs',
         }
       }
 
diff --git a/spec/classes/ceph_repo_spec.rb b/spec/classes/ceph_repo_spec.rb
index fabe2bd0..3b6157c9 100644
--- a/spec/classes/ceph_repo_spec.rb
+++ b/spec/classes/ceph_repo_spec.rb
@@ -73,7 +73,7 @@ describe 'ceph::repo' do
         :gpgkey     => "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{facts[:os]['release']['major']}",
         :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
         :priority   => '20',
-        :exclude    => 'python-ceph-compat python-rbd python-rados python-cephfs',
+        :exclude    => 'python3-rbd python3-rados python3-cephfs',
       )}
 
       it { should contain_yumrepo('ext-ceph').with(
@@ -115,7 +115,7 @@ describe 'ceph::repo' do
         :gpgkey     => "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{facts[:os]['release']['major']}",
         :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
         :priority   => '20',
-        :exclude    => 'python-ceph-compat python-rbd python-rados python-cephfs',
+        :exclude    => 'python3-rbd python3-rados python3-cephfs',
       )}
 
       it { should contain_yumrepo('ext-ceph').with(
@@ -169,7 +169,7 @@ describe 'ceph::repo' do
         :gpgkey         => "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{facts[:os]['release']['major']}",
         :mirrorlist     => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
         :priority       => '20',
-        :exclude        => 'python-ceph-compat python-rbd python-rados python-cephfs',
+        :exclude        => 'python3-rbd python3-rados python3-cephfs',
         :proxy          => 'http://someproxy.com:8080/',
         :proxy_username => 'proxyuser',
         :proxy_password => 'proxypassword',
@@ -220,7 +220,7 @@ describe 'ceph::repo' do
         :gpgkey     => "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{facts[:os]['release']['major']}",
         :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
         :priority   => '20',
-        :exclude    => 'python-ceph-compat python-rbd python-rados python-cephfs',
+        :exclude    => 'python3-rbd python3-rados python3-cephfs',
       )}
 
       it { should contain_yumrepo('ext-ceph').with(
@@ -258,7 +258,7 @@ describe 'ceph::repo' do
         :gpgkey     => "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{facts[:os]['release']['major']}",
         :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
         :priority   => '20',
-        :exclude    => 'python-ceph-compat python-rbd python-rados python-cephfs',
+        :exclude    => 'python3-rbd python3-rados python3-cephfs',
       )}
 
       it { should contain_yumrepo('ext-ceph').with(
@@ -300,7 +300,7 @@ describe 'ceph::repo' do
         :gpgkey     => "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{facts[:os]['release']['major']}",
         :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
         :priority   => '20',
-        :exclude    => 'python-ceph-compat python-rbd python-rados python-cephfs',
+        :exclude    => 'python3-rbd python3-rados python3-cephfs',
       )}
 
       it { should contain_yumrepo('ext-ceph').with(
@@ -378,7 +378,7 @@ describe 'ceph::repo' do
         :gpgkey     => "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{facts[:os]['release']['major']}",
         :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
         :priority   => '20',
-        :exclude    => 'python-ceph-compat python-rbd python-rados python-cephfs',
+        :exclude    => 'python3-rbd python3-rados python3-cephfs',
       )}
 
       it { should contain_yumrepo('ext-ceph').with(