openstack/puppet-cinder
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: I152451ef1be492bfa96868fdc1d89f4eabce3371
This commit is contained in:
Thomas Goirand 2021-05-21 11:01:18 +02:00
parent e73bf6a864
commit 6874113187
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/params.pp
View File

@ -4,9 +4,8 @@
#
class cinder::params {
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-cinderclient"
$client_package = 'python3-cinderclient'
$group = 'cinder'
$cinder_wsgi_script_source = '/usr/bin/cinder-wsgi'

10
spec/classes/cinder_client_spec.rb
View File

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