openstack/puppet-ceph
Code Issues Proposed changes

Fix outdated package names to be excluded from EPEL

Browse Source 
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>
This commit is contained in:
Takashi Kajinami
2025-08-03 03:26:19 +09:00
parent dfdf0e2519
commit 3ea0150dd1
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/repo.pp
View File

@@ -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", mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-${el}&arch=\$basearch",
priority => '20', # prefer ceph repos over EPEL priority => '20', # prefer ceph repos over EPEL
tag => 'ceph', tag => 'ceph',
exclude => 'python-ceph-compat python-rbd python-rados python-cephfs', exclude => 'python3-rbd python3-rados python3-cephfs',
} }
} }

14
spec/classes/ceph_repo_spec.rb
View File

@@ -73,7 +73,7 @@ describe 'ceph::repo' do
:gpgkey => "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-#{facts[:os]['release']['major']}", :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", :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
:priority => '20', :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( 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']}", :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", :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
:priority => '20', :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( 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']}", :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", :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
:priority => '20', :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 => 'http://someproxy.com:8080/',
:proxy_username => 'proxyuser', :proxy_username => 'proxyuser',
:proxy_password => 'proxypassword', :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']}", :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", :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
:priority => '20', :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( 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']}", :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", :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
:priority => '20', :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( 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']}", :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", :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
:priority => '20', :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( 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']}", :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", :mirrorlist => "http://mirrors.fedoraproject.org/metalink?repo=epel-#{facts[:os]['release']['major']}&arch=$basearch",
:priority => '20', :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( it { should contain_yumrepo('ext-ceph').with(