openstack/puppet-glare
Code Issues Proposed changes

Inherit pyvers from openstacklib::defaults

Browse Source 
Change-Id: I4d27bbbb16f87cf0051f1bbed2429e1c8affd14c
This commit is contained in:
Tobias Urdin 2019-01-17 21:30:39 +01:00
parent af77837871
commit 580ead284f
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/params.pp
View File

@ -2,13 +2,7 @@
#
class glare::params {
include ::openstacklib::defaults
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
} else {
$pyvers = ''
}
$pyvers = $::openstacklib::defaults::pyvers
$group = 'glare'
$client_package_name = "python${pyvers}-glareclient"
@ -18,9 +12,9 @@ class glare::params {
$glare_package_name = 'openstack-glare'
$glare_service_name = 'openstack-glare-api'
if ($::operatingsystem != 'fedora' and versioncmp($::operatingsystemrelease, '7') < 0) {
$pyceph_package_name = 'python-ceph'
$pyceph_package_name = "python${pyvers}-ceph"
} else {
$pyceph_package_name = 'python-rbd'
$pyceph_package_name = "python${pyvers}-rbd"
}
}
'Debian': {

6
spec/classes/glare_client_spec.rb
View File

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