openstack
/
puppet-barbican
Code Issues Proposed changes

Merge "Get rid of the $pyvers variable"

This commit is contained in:
Zuul 2021-05-27 14:10:07 +00:00 committed by Gerrit Code Review
parent 7c74f5f8fa 68b83d31bb
commit 80808bc79f
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 barbican::params {
include openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$client_package_name = "python${pyvers}-barbicanclient"
$client_package_name = 'python3-barbicanclient'
$group = 'barbican'
$dogtag_client_package = 'pki-base'

10
spec/classes/barbican_client_spec.rb
View File

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