Inherit pyvers from openstacklib::defaults

Change-Id: I8f20863153a42e65401db44c13babbd41a23a34b
This commit is contained in:
Tobias Urdin 2019-01-17 22:04:44 +01:00
parent db576c4e84
commit 34fc209ee2
2 changed files with 4 additions and 13 deletions

View File

@ -2,16 +2,11 @@
#
class tacker::params {
include ::openstacklib::defaults
$pyvers = $::openstacklib::defaults::pyvers
$group = 'tacker'
if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
$pyvers = '3'
} else {
$pyvers = ''
}
$client_package_name = "python${pyvers}-tackerclient"
case $::osfamily {
'RedHat': {
$package_name = 'openstack-tacker'

View File

@ -31,11 +31,7 @@ describe 'tacker::client' do
let(:platform_params) do
case facts[:osfamily]
when 'Debian'
if facts[:os_package_type] == 'debian'
{ :client_package_name => 'python3-tackerclient' }
else
{ :client_package_name => 'python-tackerclient' }
end
{ :client_package_name => 'python3-tackerclient' }
when 'RedHat'
{ :client_package_name => 'python-tackerclient' }
end