diff --git a/manifests/params.pp b/manifests/params.pp index 5878f77..8b740b8 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -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' diff --git a/spec/classes/cloudkitty_client_spec.rb b/spec/classes/cloudkitty_client_spec.rb index bc5fee3..5fce833 100644 --- a/spec/classes/cloudkitty_client_spec.rb +++ b/spec/classes/cloudkitty_client_spec.rb @@ -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