openstack/puppet-manila
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: I028c489eb28dba84dc6c4fe0e544863733fc7f11
This commit is contained in:
Thomas Goirand 2021-05-21 11:49:05 +02:00
parent f0ec3d8488
commit 2068041f18
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/params.pp
View File

@ -3,11 +3,9 @@
# Parameters for puppet-manila
#
class manila::params {
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package = "python${pyvers}-manilaclient"
$client_package = 'python3-manilaclient'
$db_sync_command = 'manila-manage db sync'
$lio_package_name = 'targetcli'
$group = 'manila'

10
spec/classes/manila_client_spec.rb
View File

@ -29,15 +29,7 @@ describe 'manila::client' do
when 'Debian'
{ :client_package => 'python3-manilaclient' }
when 'RedHat'
if facts[:operatingsystem] == 'Fedora'
{ :client_package => 'python3-manilaclient' }
else
if facts[:operatingsystemmajrelease] > '7'
{ :client_package => 'python3-manilaclient' }
else
{ :client_package => 'python-manilaclient' }
end
end
{ :client_package => 'python3-manilaclient' }
end
end