Merge "Get rid of the $pyvers variable"
This commit is contained in:
commit
80808bc79f
|
@ -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'
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue