From 937174c8e4567ce5abd8768af3c524c9cf99005d Mon Sep 17 00:00:00 2001 From: zhubingbing Date: Thu, 12 Apr 2018 10:47:02 +0800 Subject: [PATCH] Debian is using python3-congressclient Change-Id: I314960ec65ab05f08ec54493178603a1977af48b --- manifests/params.pp | 8 +++++++- spec/classes/congress_client_spec.rb | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 2d4aee7..a908835 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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 { diff --git a/spec/classes/congress_client_spec.rb b/spec/classes/congress_client_spec.rb index 2faf810..d19f865 100644 --- a/spec/classes/congress_client_spec.rb +++ b/spec/classes/congress_client_spec.rb @@ -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