Debian is using python3-clientclient

Change-Id: Ia0473a04835cd207b27c19f9d09abc74890a1d2b
This commit is contained in:
zhubingbing 2018-04-12 10:40:21 +08:00
parent 8bffeef9cc
commit 9bc86dd616
2 changed files with 21 additions and 2 deletions

View File

@ -5,7 +5,13 @@
class cinder::params {
include ::openstacklib::defaults
$client_package = 'python-cinderclient'
if ($::os_package_type == 'debian') {
$pyvers = '3'
} else {
$pyvers = ''
}
$client_package = "python${pyvers}-cinderclient"
$group = 'cinder'
$cinder_wsgi_script_source = '/usr/bin/cinder-wsgi'

View File

@ -19,7 +19,7 @@ describe 'cinder::client' do
it 'installs cinder client package' do
is_expected.to contain_package('python-cinderclient').with(
:name => 'python-cinderclient',
:name => platform_params[:client_package_name],
:ensure => p[:package_ensure],
:tag => ['openstack', 'cinder-support-package'],
)
@ -42,6 +42,19 @@ describe 'cinder::client' do
facts.merge(OSDefaults.get_facts({:os_workers => 8}))
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-cinderclient' }
else
{ :client_package_name => 'python-cinderclient' }
end
when 'RedHat'
{ :client_package_name => 'python-cinderclient' }
end
end
it_configures 'cinder client'
end
end