openstack/puppet-swift
Code Issues Proposed changes

Remove logic for CentOS < 9

Browse Source 
... because RDO supports CentOS Stream 9 (aka CentOS 9) only since Zed.

Change-Id: I9f1faaaf8481da40992e5ccf3cc0c7a66f4811ea
This commit is contained in:
Takashi Kajinami
2022-11-21 14:04:41 +09:00
parent 0dcd3afa09
commit be26baa863
4 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@@ -66,11 +66,7 @@ class swift::params {
$account_reaper_service_name = 'openstack-swift-account-reaper' $account_reaper_service_name = 'openstack-swift-account-reaper'
$account_replicator_service_name = 'openstack-swift-account-replicator' $account_replicator_service_name = 'openstack-swift-account-replicator'
$ceilometermiddleware_package_name = 'python3-ceilometermiddleware' $ceilometermiddleware_package_name = 'python3-ceilometermiddleware'
if (Integer.new($::os['release']['major']) > 8) {
$xinetd_available = false $xinetd_available = false
} else {
$xinetd_available = true
}
} }
default: { default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \ fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \

4
spec/classes/swift_ringserver_spec.rb
View File

@@ -74,11 +74,7 @@ describe 'swift::ringserver' do
when 'Debian' when 'Debian'
{ :xinetd_available => true } { :xinetd_available => true }
when 'RedHat' when 'RedHat'
if facts[:operatingsystemmajrelease] > '8'
{ :xinetd_available => false } { :xinetd_available => false }
else
{ :xinetd_available => true }
end
end end
end end

4
spec/classes/swift_storage_all_spec.rb
View File

@@ -177,11 +177,7 @@ describe 'swift::storage::all' do
when 'Debian' when 'Debian'
{ :xinetd_available => true } { :xinetd_available => true }
when 'RedHat' when 'RedHat'
if facts[:operatingsystemmajrelease] > '8'
{ :xinetd_available => false } { :xinetd_available => false }
else
{ :xinetd_available => true }
end
end end
end end

4
spec/classes/swift_storage_spec.rb
View File

@@ -62,11 +62,7 @@ describe 'swift::storage' do
when 'Debian' when 'Debian'
{ :xinetd_available => true } { :xinetd_available => true }
when 'RedHat' when 'RedHat'
if facts[:operatingsystemmajrelease] > '8'
{ :xinetd_available => false } { :xinetd_available => false }
else
{ :xinetd_available => true }
end
end end
end end