openstack
/
puppet-congress
Code Issues Proposed changes

Debian is using python3-congressclient 

Change-Id: I314960ec65ab05f08ec54493178603a1977af48b
This commit is contained in:
zhubingbing 2018-04-12 10:47:02 +08:00
parent d0dd20212a
commit 937174c8e4
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/params.pp
View File

@ -5,11 +5,17 @@
class congress::params {
include ::openstacklib::defaults
if ($::os_package_type == 'debian') {
$pyvers = '3'
} else {
$pyvers = ''
}
$drivers = ['congress.datasources.neutronv2_driver.NeutronV2Driver,congress.datasources.glancev2_driver.GlanceV2Driver',
'congress.datasources.nova_driver.NovaDriver',
'congress.datasources.keystone_driver.KeystoneDriver',
'congress.datasources.cinder_driver.CinderDriver']
$client_package_name = 'python-congressclient'
$client_package_name = "python${pyvers}-congressclient"
$group = 'congress'
case $::osfamily {

15
spec/classes/congress_client_spec.rb
View File

@ -12,7 +12,7 @@ describe 'congress::client' do
it 'contains congressclient' do
is_expected.to contain_package('python-congressclient').with(
:ensure => 'present',
:name => 'python-congressclient',
:name => platform_params[:client_package_name],
)
end
end
@ -27,6 +27,19 @@ describe 'congress::client' do
facts.merge!(OSDefaults.get_facts())
end
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-congressclient' }
else
{ :client_package_name => 'python-congressclient' }
end
when 'RedHat'
{ :client_package_name => 'python-congressclient' }
end
end
it_behaves_like 'congress::client'
end
end