Remove logic for CentOS < 9
... because RDO supports CentOS Stream 9 (aka CentOS 9) only since Zed. Change-Id: I9f1faaaf8481da40992e5ccf3cc0c7a66f4811ea
This commit is contained in:
@@ -66,11 +66,7 @@ class swift::params {
|
||||
$account_reaper_service_name = 'openstack-swift-account-reaper'
|
||||
$account_replicator_service_name = 'openstack-swift-account-replicator'
|
||||
$ceilometermiddleware_package_name = 'python3-ceilometermiddleware'
|
||||
if (Integer.new($::os['release']['major']) > 8) {
|
||||
$xinetd_available = false
|
||||
} else {
|
||||
$xinetd_available = true
|
||||
}
|
||||
$xinetd_available = false
|
||||
}
|
||||
default: {
|
||||
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
|
||||
|
@@ -72,13 +72,9 @@ describe 'swift::ringserver' do
|
||||
let (:platform_params) do
|
||||
case facts[:osfamily]
|
||||
when 'Debian'
|
||||
{ :xinetd_available => true }
|
||||
{ :xinetd_available => true }
|
||||
when 'RedHat'
|
||||
if facts[:operatingsystemmajrelease] > '8'
|
||||
{ :xinetd_available => false }
|
||||
else
|
||||
{ :xinetd_available => true }
|
||||
end
|
||||
{ :xinetd_available => false }
|
||||
end
|
||||
end
|
||||
|
||||
|
@@ -175,13 +175,9 @@ describe 'swift::storage::all' do
|
||||
let (:platform_params) do
|
||||
case facts[:osfamily]
|
||||
when 'Debian'
|
||||
{ :xinetd_available => true }
|
||||
{ :xinetd_available => true }
|
||||
when 'RedHat'
|
||||
if facts[:operatingsystemmajrelease] > '8'
|
||||
{ :xinetd_available => false }
|
||||
else
|
||||
{ :xinetd_available => true }
|
||||
end
|
||||
{ :xinetd_available => false }
|
||||
end
|
||||
end
|
||||
|
||||
|
@@ -62,11 +62,7 @@ describe 'swift::storage' do
|
||||
when 'Debian'
|
||||
{ :xinetd_available => true }
|
||||
when 'RedHat'
|
||||
if facts[:operatingsystemmajrelease] > '8'
|
||||
{ :xinetd_available => false }
|
||||
else
|
||||
{ :xinetd_available => true }
|
||||
end
|
||||
{ :xinetd_available => false }
|
||||
end
|
||||
end
|
||||
|
||||
|
Reference in New Issue
Block a user