Inherit pyvers from openstacklib::defaults
Change-Id: I3c19214409a7af5925d3d018e64519605d5cb25a
This commit is contained in:
parent
a79784d6f8
commit
09672d69cc
|
@ -4,13 +4,7 @@
|
||||||
#
|
#
|
||||||
class congress::params {
|
class congress::params {
|
||||||
include ::openstacklib::defaults
|
include ::openstacklib::defaults
|
||||||
|
$pyvers = $::openstacklib::defaults::pyvers
|
||||||
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
|
|
||||||
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
|
|
||||||
$pyvers = '3'
|
|
||||||
} else {
|
|
||||||
$pyvers = ''
|
|
||||||
}
|
|
||||||
|
|
||||||
$drivers = ['congress.datasources.neutronv2_driver.NeutronV2Driver,congress.datasources.glancev2_driver.GlanceV2Driver',
|
$drivers = ['congress.datasources.neutronv2_driver.NeutronV2Driver,congress.datasources.glancev2_driver.GlanceV2Driver',
|
||||||
'congress.datasources.nova_driver.NovaDriver',
|
'congress.datasources.nova_driver.NovaDriver',
|
||||||
|
|
|
@ -31,11 +31,7 @@ describe 'congress::client' do
|
||||||
let(:platform_params) do
|
let(:platform_params) do
|
||||||
case facts[:osfamily]
|
case facts[:osfamily]
|
||||||
when 'Debian'
|
when 'Debian'
|
||||||
if facts[:os_package_type] == 'debian'
|
{ :client_package_name => 'python3-congressclient' }
|
||||||
{ :client_package_name => 'python3-congressclient' }
|
|
||||||
else
|
|
||||||
{ :client_package_name => 'python-congressclient' }
|
|
||||||
end
|
|
||||||
when 'RedHat'
|
when 'RedHat'
|
||||||
{ :client_package_name => 'python-congressclient' }
|
{ :client_package_name => 'python-congressclient' }
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue