From 33c8094fdca8fbad25cf7bcf4242be7454d59b6b Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Thu, 17 Jan 2019 22:07:47 +0100
Subject: [PATCH] Inherit pyvers from openstacklib::defaults

Change-Id: Ie30a1e4583de5b76a0e6af900d43090a53387b66
---
 manifests/params.pp                 | 8 +-------
 spec/classes/vitrage_client_spec.rb | 6 +-----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 54d4c07..27a80b8 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,13 +4,7 @@
 #
 class vitrage::params {
   include ::openstacklib::defaults
-
-  if ($::os_package_type == 'debian') or ($::os['name'] == 'Fedora') or
-    ($::os['family'] == 'RedHat' and Integer.new($::os['release']['major']) > 7) {
-    $pyvers = '3'
-  } else {
-    $pyvers = ''
-  }
+  $pyvers = $::openstacklib::defaults::pyvers
 
   $client_package_name = "python${pyvers}-vitrageclient"
   $group               = 'vitrage'
diff --git a/spec/classes/vitrage_client_spec.rb b/spec/classes/vitrage_client_spec.rb
index 7821f9f..9256f9f 100644
--- a/spec/classes/vitrage_client_spec.rb
+++ b/spec/classes/vitrage_client_spec.rb
@@ -26,11 +26,7 @@ describe 'vitrage::client' do
       let(:platform_params) do
         case facts[:osfamily]
         when 'Debian'
-          if facts[:os_package_type] == 'debian'
-            { :client_package_name => 'python3-vitrageclient' }
-          else
-            { :client_package_name => 'python-vitrageclient' }
-          end
+          { :client_package_name => 'python3-vitrageclient' }
         when 'RedHat'
           { :client_package_name => 'python-vitrageclient' }
         end