From 2a6342ab797053e75a41370b2e1372cef8e1e247 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Thu, 17 Jan 2019 21:27:05 +0100 Subject: [PATCH] Inherit pyvers from openstacklib::defaults Change-Id: Ie770b349c157bc36e19846971fece37f336a8b32 --- manifests/params.pp | 7 +------ spec/classes/freezer_client_spec.rb | 6 +----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index bc2eca8..cc556ef 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -2,12 +2,7 @@ # class freezer::params { include ::openstacklib::defaults - - if ($::os_package_type == 'debian') { - $pyvers = '3' - } else { - $pyvers = '' - } + $pyvers = $::openstacklib::defaults::pyvers $api_deploy_method = 'apache' $api_bind_port = '9090' diff --git a/spec/classes/freezer_client_spec.rb b/spec/classes/freezer_client_spec.rb index 3c8d167..92807f7 100644 --- a/spec/classes/freezer_client_spec.rb +++ b/spec/classes/freezer_client_spec.rb @@ -24,11 +24,7 @@ describe 'freezer::client' do let(:platform_params) do case facts[:osfamily] when 'Debian' - if facts[:os_package_type] == 'debian' - { :client_package_name => 'python3-freezerclient' } - else - { :client_package_name => 'python-freezerclient' } - end + { :client_package_name => 'python3-freezerclient' } when 'RedHat' { :client_package_name => 'python-freezerclient' } end