openstack/puppet-glare
Code Issues Proposed changes

Merge "Debian is using python3-glareclient"

Browse Source
This commit is contained in:
Zuul 2018-04-13 03:13:42 +00:00 committed by Gerrit Code Review
commit 67a0ee0f19
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/params.pp
View File

@ -3,8 +3,14 @@
class glare::params {
include ::openstacklib::defaults
if ($::os_package_type == 'debian') {
$pyvers = '3'
} else {
$pyvers = ''
}
$group = 'glare'
$client_package_name = 'python-glareclient'
$client_package_name = "python${pyvers}-glareclient"
case $::osfamily {
'RedHat': {

13
spec/classes/glare_client_spec.rb
View File

@ -24,8 +24,17 @@ describe 'glare::client' do
facts.merge!(OSDefaults.get_facts())
end
let :platform_params do
{ :client_package_name => 'python-glareclient' }
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
when 'RedHat'
{ :client_package_name => 'python-glareclient' }
end
end
it_behaves_like 'glare client'