openstack/puppet-barbican
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: Ibf93bdbf3c9e2985108f7ebb84de541ac2bb3a67
This commit is contained in:
Thomas Goirand
2021-05-21 10:42:42 +02:00
parent 6e01e95946
commit 68b83d31bb
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/params.pp
View File

@@ -4,9 +4,8 @@
# #
class barbican::params { class barbican::params {
include openstacklib::defaults include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-barbicanclient" $client_package_name = 'python3-barbicanclient'
$group = 'barbican' $group = 'barbican'
$dogtag_client_package = 'pki-base' $dogtag_client_package = 'pki-base'

10
spec/classes/barbican_client_spec.rb
View File

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