From 09139955cbe02e9e8a150da3909255f9c36c8721 Mon Sep 17 00:00:00 2001
From: zhubingbing <zhu.bingbing@99cloud.net>
Date: Thu, 12 Apr 2018 11:36:09 +0800
Subject: [PATCH] Debian is using python3-swiftclient

Change-Id: I64f7fc1a2172f5f4a200a822eb4f617fde65db55
---
 manifests/params.pp               |  8 +++++++-
 spec/classes/swift_client_spec.rb | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index f9a83e81..584bd58b 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,7 +5,13 @@
 class swift::params {
   include ::openstacklib::defaults
 
-  $client_package   = 'python-swiftclient'
+  if ($::os_package_type == 'debian') {
+    $pyvers = '3'
+  } else {
+    $pyvers = ''
+  }
+
+  $client_package   = "python${pyvers}-swiftclient"
   $service_provider = undef
 
   case $::osfamily {
diff --git a/spec/classes/swift_client_spec.rb b/spec/classes/swift_client_spec.rb
index c7b04797..94b95c10 100644
--- a/spec/classes/swift_client_spec.rb
+++ b/spec/classes/swift_client_spec.rb
@@ -19,7 +19,7 @@ describe 'swift::client' do
 
     it 'installs swift client package' do
       is_expected.to contain_package('swiftclient').with(
-        :name   => 'python-swiftclient',
+        :name   => platform_params[:client_package_name],
         :ensure => p[:package_ensure],
         :tag    => ['openstack','swift-support-package'],
       )
@@ -37,6 +37,19 @@ describe 'swift::client' do
         }))
       end
 
+      let(:platform_params) do
+        case facts[:osfamily]
+        when 'Debian'
+          if facts[:os_package_type] == 'debian'
+            { :client_package_name => 'python3-swiftclient' }
+          else
+            { :client_package_name => 'python-swiftclient' }
+          end
+        when 'RedHat'
+          { :client_package_name => 'python-swiftclient' }
+        end
+      end
+
       it_configures 'swift client'
     end
   end