openstack/puppet-swift
Code Issues Proposed changes

Get rid of the $pyvers variable

Browse Source 
Since everyone has switched to Python3, it's time for the removal of the
$pyvers variable.

Change-Id: Iddf30d802758324334cb3d941e2ed8b6a2979695
This commit is contained in:
Thomas Goirand
2021-05-21 14:12:41 +02:00
parent 3ccb2cd44e
commit 5b0745101a
4 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
manifests/params.pp
View File

@@ -4,10 +4,9 @@
# #
class swift::params { class swift::params {
include openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-swiftclient" $client_package = 'python3-swiftclient'
$dnspython_pakage_name = "python${pyvers}-dnspython" $dnspython_pakage_name = 'python3-dnspython'
$service_provider = undef $service_provider = undef
case $::osfamily { case $::osfamily {
@@ -35,7 +34,7 @@ class swift::params {
$account_auditor_service_name = 'swift-account-auditor' $account_auditor_service_name = 'swift-account-auditor'
$account_reaper_service_name = 'swift-account-reaper' $account_reaper_service_name = 'swift-account-reaper'
$account_replicator_service_name = 'swift-account-replicator' $account_replicator_service_name = 'swift-account-replicator'
$ceilometermiddleware_package_name = "python${pyvers}-ceilometermiddleware" $ceilometermiddleware_package_name = 'python3-ceilometermiddleware'
} }
'RedHat': { 'RedHat': {
$package_name = 'openstack-swift' $package_name = 'openstack-swift'
@@ -61,7 +60,7 @@ class swift::params {
$account_auditor_service_name = 'openstack-swift-account-auditor' $account_auditor_service_name = 'openstack-swift-account-auditor'
$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 = "python${pyvers}-ceilometermiddleware" $ceilometermiddleware_package_name = 'python3-ceilometermiddleware'
} }
default: { default: {
fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \ fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \

8
spec/classes/swift_client_spec.rb
View File

@@ -43,15 +43,7 @@ describe 'swift::client' do
when 'Debian' when 'Debian'
{ :client_package_name => 'python3-swiftclient' } { :client_package_name => 'python3-swiftclient' }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :client_package_name => 'python3-swiftclient' } { :client_package_name => 'python3-swiftclient' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :client_package_name => 'python3-swiftclient' }
else
{ :client_package_name => 'python-swiftclient' }
end
end
end end
end end

8
spec/classes/swift_proxy_ceilometer_spec.rb
View File

@@ -121,15 +121,7 @@ describe 'swift::proxy::ceilometer' do
when 'Debian' when 'Debian'
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' } { :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' } { :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :ceilometermiddleware_package_name => 'python3-ceilometermiddleware' }
else
{ :ceilometermiddleware_package_name => 'python-ceilometermiddleware' }
end
end
end end
end end

8
spec/classes/swift_proxy_cname_lookup_spec.rb
View File

@@ -56,15 +56,7 @@ describe 'swift::proxy::cname_lookup' do
when 'Debian' when 'Debian'
{ :dnspython_package_name => 'python3-dnspython' } { :dnspython_package_name => 'python3-dnspython' }
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :dnspython_package_name => 'python3-dnspython' } { :dnspython_package_name => 'python3-dnspython' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :dnspython_package_name => 'python3-dnspython' }
else
{ :dnspython_package_name => 'python-dnspython' }
end
end
end end
end end