Inherit pyvers from openstacklib::defaults

Change-Id: I22c57e83ce65d68f22c04ab52b9f8a35dae956a7
This commit is contained in:
Tobias Urdin 2019-01-17 21:21:24 +01:00
parent cb3b279354
commit d31d3794d3
2 changed files with 2 additions and 11 deletions

View File

@ -4,13 +4,8 @@
#
class cloudkitty::params {
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 = ''
}
$client_package_name = "python${pyvers}-cloudkittyclient"
$api_service_name = 'cloudkitty-api'
$processor_service_name = 'cloudkitty-processor'

View File

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