openstack
/
puppet-tacker
Code Issues Proposed changes

Merge "Debian is using python3-tackerclient"

This commit is contained in:
Zuul 2018-04-13 03:49:04 +00:00 committed by Gerrit Code Review
parent 63c6c4443b b2517b0bf2
commit 478382f009
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/params.pp
View File

@ -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'

16
spec/classes/tacker_client_spec.rb
View File

@ -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