From 1e32e3c6694f64b03730281c8fd41b3dd8be70e9 Mon Sep 17 00:00:00 2001
From: Lee Yarwood <lyarwood@redhat.com>
Date: Fri, 11 Jan 2019 13:17:05 +0000
Subject: [PATCH] Inherit pyvers from openstacklib::defaults

Depends-On: I84b767921d151a61429b2c89e6372c4b447f0d7d
Change-Id: I0c13af5bbafc347078d010ebbe2358af22b8e0d2
---
 manifests/params.pp                | 8 +-------
 spec/classes/cinder_client_spec.rb | 6 +-----
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 08edfe3c..1dc67dcf 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -4,13 +4,7 @@
 #
 class cinder::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            = "python${pyvers}-cinderclient"
   $group                     = 'cinder'
diff --git a/spec/classes/cinder_client_spec.rb b/spec/classes/cinder_client_spec.rb
index b6a54e22..265de9b3 100644
--- a/spec/classes/cinder_client_spec.rb
+++ b/spec/classes/cinder_client_spec.rb
@@ -46,11 +46,7 @@ describe 'cinder::client' do
       let(:platform_params) do
         case facts[:osfamily]
         when 'Debian'
-          if facts[:os_package_type] == 'debian'
-            { :client_package_name => 'python3-cinderclient' }
-          else
-            { :client_package_name => 'python-cinderclient' }
-          end
+          { :client_package_name => 'python3-cinderclient' }
         when 'RedHat'
           { :client_package_name => 'python-cinderclient' }
         end