openstack/puppet-zaqar
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: I35b86a599d9e947648cad38904d54a8f998696e1
This commit is contained in:
Thomas Goirand 2021-06-14 09:44:42 +02:00
parent 3e4d8d14c5
commit 0cfbe2484c
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

@ -5,10 +5,9 @@
class zaqar::params { class zaqar::params {
include openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$pyver3 = $::openstacklib::defaults::pyver3 $pyver3 = $::openstacklib::defaults::pyver3
$client_package_name = "python${pyvers}-zaqarclient" $client_package_name = 'python3-zaqarclient'
$group = 'zaqar' $group = 'zaqar'
case $::osfamily { case $::osfamily {

8
spec/classes/zaqar_client_spec.rb
View File

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