Inherit pyvers from openstacklib::defaults

Change-Id: I3c19214409a7af5925d3d018e64519605d5cb25a
This commit is contained in:
Tobias Urdin 2019-01-17 21:22:40 +01:00
parent a79784d6f8
commit 09672d69cc
2 changed files with 2 additions and 12 deletions

View File

@ -4,13 +4,7 @@
#
class congress::params {
include ::openstacklib::defaults
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
} else {
$pyvers = ''
}
$pyvers = $::openstacklib::defaults::pyvers
$drivers = ['congress.datasources.neutronv2_driver.NeutronV2Driver,congress.datasources.glancev2_driver.GlanceV2Driver',
'congress.datasources.nova_driver.NovaDriver',

View File

@ -31,11 +31,7 @@ describe 'congress::client' do
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
{ :client_package_name => 'python3-congressclient' }
when 'RedHat'
{ :client_package_name => 'python-congressclient' }
end