From b8531ca6271314805a5f1ee1d37df4d82b03a4b3 Mon Sep 17 00:00:00 2001
From: zhubingbing <zhu.bingbing@99cloud.net>
Date: Thu, 12 Apr 2018 11:01:28 +0800
Subject: [PATCH] Debian is using python3-glareclient

Change-Id: I7aef5afe2012249a827254ec2de320cc0c017427
---
 manifests/params.pp               |  8 +++++++-
 spec/classes/glare_client_spec.rb | 13 +++++++++++--
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index b1f8478..b04ed59 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -3,8 +3,14 @@
 class glare::params {
   include ::openstacklib::defaults
 
+  if ($::os_package_type == 'debian') {
+    $pyvers = '3'
+  } else {
+    $pyvers = ''
+  }
+
   $group = 'glare'
-  $client_package_name = 'python-glareclient'
+  $client_package_name = "python${pyvers}-glareclient"
 
   case $::osfamily {
     'RedHat': {
diff --git a/spec/classes/glare_client_spec.rb b/spec/classes/glare_client_spec.rb
index ce77580..3ce64f8 100644
--- a/spec/classes/glare_client_spec.rb
+++ b/spec/classes/glare_client_spec.rb
@@ -24,8 +24,17 @@ describe 'glare::client' do
         facts.merge!(OSDefaults.get_facts())
       end
 
-      let :platform_params do
-        { :client_package_name => 'python-glareclient' }
+      let(:platform_params) do
+        case facts[:osfamily]
+        when 'Debian'
+          if facts[:os_package_type] == 'debian'
+            { :client_package_name => 'python3-glareclient' }
+          else
+            { :client_package_name => 'python-glareclient' }
+          end
+        when 'RedHat'
+          { :client_package_name => 'python-glareclient' }
+        end
       end
 
       it_behaves_like 'glare client'