openstack/puppet-glance
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: I3878af33cb0deeddeb3d7b299525201edcc65976
This commit is contained in:
Thomas Goirand
2021-05-21 11:15:11 +02:00
parent 76d1c5bff9
commit 28de7383cf
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

@@ -2,9 +2,8 @@
# should be considered to be constant # should be considered to be constant
class glance::params { class glance::params {
include openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-glanceclient" $client_package_name = 'python3-glanceclient'
$cache_cleaner_command = 'glance-cache-cleaner' $cache_cleaner_command = 'glance-cache-cleaner'
$cache_pruner_command = 'glance-cache-pruner' $cache_pruner_command = 'glance-cache-pruner'
@@ -15,16 +14,16 @@ class glance::params {
$package_name = 'openstack-glance' $package_name = 'openstack-glance'
$api_package_name = undef $api_package_name = undef
$api_service_name = 'openstack-glance-api' $api_service_name = 'openstack-glance-api'
$pyceph_package_name = "python${pyvers}-rbd" $pyceph_package_name = 'python3-rbd'
} }
'Debian': { 'Debian': {
$package_name = undef $package_name = undef
$api_package_name = 'glance-api' $api_package_name = 'glance-api'
$api_service_name = 'glance-api' $api_service_name = 'glance-api'
if $::os_package_type == 'debian' { if $::os_package_type == 'debian' {
$pyceph_package_name = "python${pyvers}-ceph" $pyceph_package_name = 'python-ceph'
} else { } else {
$pyceph_package_name = "python${pyvers}-rbd" $pyceph_package_name = 'python3-rbd'
} }
} }
default: { default: {

8
spec/classes/glance_backend_rbd_spec.rb
View File

@@ -67,15 +67,7 @@ describe 'glance::backend::rbd' do
{ :pyceph_package_name => 'python3-rbd' } { :pyceph_package_name => 'python3-rbd' }
end end
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :pyceph_package_name => 'python3-rbd' } { :pyceph_package_name => 'python3-rbd' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :pyceph_package_name => 'python3-rbd' }
else
{ :pyceph_package_name => 'python-rbd' }
end
end
end end
end end

8
spec/classes/glance_client_spec.rb
View File

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

8
spec/defines/glance_backend_multistore_rbd_spec.rb
View File

@@ -89,15 +89,7 @@ describe 'glance::backend::multistore::rbd' do
{ :pyceph_package_name => 'python3-rbd' } { :pyceph_package_name => 'python3-rbd' }
end end
when 'RedHat' when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :pyceph_package_name => 'python3-rbd' } { :pyceph_package_name => 'python3-rbd' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :pyceph_package_name => 'python3-rbd' }
else
{ :pyceph_package_name => 'python-rbd' }
end
end
end end
end end