Get rid of the $pyvers variable
Since everyone has switched to Python3, it's time for the removal of the $pyvers variable. Change-Id: I3878af33cb0deeddeb3d7b299525201edcc65976
This commit is contained in:
parent
76d1c5bff9
commit
28de7383cf
|
@ -2,9 +2,8 @@
|
|||
# should be considered to be constant
|
||||
class glance::params {
|
||||
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_pruner_command = 'glance-cache-pruner'
|
||||
|
@ -15,16 +14,16 @@ class glance::params {
|
|||
$package_name = 'openstack-glance'
|
||||
$api_package_name = undef
|
||||
$api_service_name = 'openstack-glance-api'
|
||||
$pyceph_package_name = "python${pyvers}-rbd"
|
||||
$pyceph_package_name = 'python3-rbd'
|
||||
}
|
||||
'Debian': {
|
||||
$package_name = undef
|
||||
$api_package_name = 'glance-api'
|
||||
$api_service_name = 'glance-api'
|
||||
if $::os_package_type == 'debian' {
|
||||
$pyceph_package_name = "python${pyvers}-ceph"
|
||||
$pyceph_package_name = 'python-ceph'
|
||||
} else {
|
||||
$pyceph_package_name = "python${pyvers}-rbd"
|
||||
$pyceph_package_name = 'python3-rbd'
|
||||
}
|
||||
}
|
||||
default: {
|
||||
|
|
|
@ -67,15 +67,7 @@ describe 'glance::backend::rbd' do
|
|||
{ :pyceph_package_name => 'python3-rbd' }
|
||||
end
|
||||
when 'RedHat'
|
||||
if facts[:operatingsystem] == 'Fedora'
|
||||
{ :pyceph_package_name => 'python3-rbd' }
|
||||
else
|
||||
if facts[:operatingsystemmajrelease] > '7'
|
||||
{ :pyceph_package_name => 'python3-rbd' }
|
||||
else
|
||||
{ :pyceph_package_name => 'python-rbd' }
|
||||
end
|
||||
end
|
||||
{ :pyceph_package_name => 'python3-rbd' }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -26,15 +26,7 @@ describe 'glance::client' do
|
|||
when 'Debian'
|
||||
{ :client_package_name => 'python3-glanceclient' }
|
||||
when 'RedHat'
|
||||
if facts[:operatingsystem] == 'Fedora'
|
||||
{ :client_package_name => 'python3-glanceclient' }
|
||||
else
|
||||
if facts[:operatingsystemmajrelease] > '7'
|
||||
{ :client_package_name => 'python3-glanceclient' }
|
||||
else
|
||||
{ :client_package_name => 'python-glanceclient' }
|
||||
end
|
||||
end
|
||||
{ :client_package_name => 'python3-glanceclient' }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -89,15 +89,7 @@ describe 'glance::backend::multistore::rbd' do
|
|||
{ :pyceph_package_name => 'python3-rbd' }
|
||||
end
|
||||
when 'RedHat'
|
||||
if facts[:operatingsystem] == 'Fedora'
|
||||
{ :pyceph_package_name => 'python3-rbd' }
|
||||
else
|
||||
if facts[:operatingsystemmajrelease] > '7'
|
||||
{ :pyceph_package_name => 'python3-rbd' }
|
||||
else
|
||||
{ :pyceph_package_name => 'python-rbd' }
|
||||
end
|
||||
end
|
||||
{ :pyceph_package_name => 'python3-rbd' }
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue