openstack/puppet-zaqar
Code Issues Proposed changes

Merge "Debian is using python3-zaqarclient"

Browse Source
This commit is contained in:
Zuul 2018-04-13 04:34:34 +00:00 committed by Gerrit Code Review
commit fab8bf8950
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

@ -5,7 +5,13 @@
class zaqar::params { class zaqar::params {
include ::openstacklib::defaults include ::openstacklib::defaults
$client_package_name = 'python-zaqarclient' if ($::os_package_type == 'debian') {
$pyvers = '3'
} else {
$pyvers = ''
}
$client_package_name = "python${pyvers}-zaqarclient"
$group = 'zaqar' $group = 'zaqar'
case $::osfamily { case $::osfamily {

13
spec/classes/zaqar_client_spec.rb
View File

@ -24,8 +24,17 @@ describe 'zaqar::client' do
facts.merge!(OSDefaults.get_facts()) facts.merge!(OSDefaults.get_facts())
end end
let :platform_params do let(:platform_params) do
{ :client_package_name => 'python-zaqarclient' } case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-zaqarclient' }
else
{ :client_package_name => 'python-zaqarclient' }
end
when 'RedHat'
{ :client_package_name => 'python-zaqarclient' }
end
end end
it_behaves_like 'zaqar client' it_behaves_like 'zaqar client'