openstack/puppet-cinder
Code Issues Proposed changes

Inherit pyvers from openstacklib::defaults

Browse Source 
Depends-On: I84b767921d151a61429b2c89e6372c4b447f0d7d
Change-Id: I0c13af5bbafc347078d010ebbe2358af22b8e0d2
This commit is contained in:
Lee Yarwood 2019-01-11 13:17:05 +00:00 committed by Tobias Urdin
parent d46bab8b31
commit 1e32e3c669
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/params.pp
View File

@ -4,13 +4,7 @@
# #
class cinder::params { class cinder::params {
include ::openstacklib::defaults 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 = "python${pyvers}-cinderclient" $client_package = "python${pyvers}-cinderclient"
$group = 'cinder' $group = 'cinder'

6
spec/classes/cinder_client_spec.rb
View File

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