From b2517b0bf207e39373bc0bbe591d3001504d6eb9 Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Thu, 12 Apr 2018 11:38:46 +0800 Subject: [PATCH] Debian is using python3-tackerclient Change-Id: I618e97ae52134859405ae57373303f45f00348f0 --- manifests/params.pp | 8 +++++++- spec/classes/tacker_client_spec.rb | 16 +++++++++++++--- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 49d48d0..6072371 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -4,7 +4,13 @@ class tacker::params { include ::openstacklib::defaults $group = 'tacker' - $client_package_name = 'python-tackerclient' + if ($::os_package_type == 'debian') { + $pyvers = '3' + } else { + $pyvers = '' + } + + $client_package_name = "python${pyvers}-tackerclient" case $::osfamily { 'RedHat': { $package_name = 'openstack-tacker' diff --git a/spec/classes/tacker_client_spec.rb b/spec/classes/tacker_client_spec.rb index ef83c74..0e70a73 100644 --- a/spec/classes/tacker_client_spec.rb +++ b/spec/classes/tacker_client_spec.rb @@ -12,7 +12,7 @@ describe 'tacker::client' do it 'contains tackerclient' do is_expected.to contain_package('python-tackerclient').with( :ensure => 'present', - :name => platform_params[:tackerclient_package], + :name => platform_params[:client_package_name], :tag => 'openstack', ) end @@ -28,9 +28,19 @@ describe 'tacker::client' do facts.merge!(OSDefaults.get_facts()) end - let :platform_params do - { :tackerclient_package => 'python-tackerclient' } + let(:platform_params) do + case facts[:osfamily] + when 'Debian' + if facts[:os_package_type] == 'debian' + { :client_package_name => 'python3-tackerclient' } + else + { :client_package_name => 'python-tackerclient' } + end + when 'RedHat' + { :client_package_name => 'python-tackerclient' } + end end + it_behaves_like 'tacker::client' end