openstack
/
puppet-sahara
Code Issues Proposed changes

Inherit pyvers from openstacklib::defaults 

Change-Id: Ifc933d59d3488c1391136c553c89d701828ce0d1
This commit is contained in:
Tobias Urdin 2019-01-17 22:02:16 +01:00
parent d023feb96d
commit 08ce70ddcf
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/params.pp
View File

@ -4,13 +4,8 @@
#
class sahara::params {
include ::openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
if $::os_package_type == 'debian' or $::os['name'] == 'Fedora' or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7){
$pyvers = '3'
} else {
$pyvers = ''
}
$client_package_name = "python${pyvers}-saharaclient"
$group = 'sahara'

6
spec/classes/sahara_client_spec.rb
View File

@ -40,11 +40,7 @@ describe 'sahara::client' do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-saharaclient' }
else
{ :client_package_name => 'python-saharaclient' }
end
{ :client_package_name => 'python3-saharaclient' }
when 'RedHat'
{ :client_package_name => 'python-saharaclient' }
end