From fd58ca57ed6a617abad8ef38752758863a8195ce Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Fri, 6 Apr 2018 23:24:30 +0200
Subject: [PATCH] Debian is using Python 3

Change-Id: I50b2928ffc1bc1af8a877d37f14d1cef7d9b3c37
---
 manifests/params.pp             |  9 +++++++--
 spec/defines/oslo_cache_spec.rb | 17 +++++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index f0992a6..a153131 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -5,8 +5,13 @@
 class oslo::params {
   include ::openstacklib::defaults
 
-  $pymongo_package_name = 'python-pymongo'
-  $pylibmc_package_name = 'python-pylibmc'
+  if ($::os_package_type == 'debian') {
+    $pyvers = '3'
+  } else {
+    $pyvers = ''
+  }
+  $pymongo_package_name = "python${pyvers}-pymongo"
+  $pylibmc_package_name = "python${pyvers}-pylibmc"
 
   case $::osfamily {
     'RedHat': {
diff --git a/spec/defines/oslo_cache_spec.rb b/spec/defines/oslo_cache_spec.rb
index 47c3a78..01cf225 100644
--- a/spec/defines/oslo_cache_spec.rb
+++ b/spec/defines/oslo_cache_spec.rb
@@ -142,11 +142,24 @@ describe 'oslo::cache' do
         facts.merge!(OSDefaults.get_facts())
       end
       let(:platform_params) do
-        platform_params = { :pylibmc_package_name => 'python-pylibmc' }
+        case facts[:osfamily]
+        when 'Debian'
+          if facts[:os_package_type] == 'debian'
+            platform_params = { :pylibmc_package_name => 'python3-pylibmc' }
+          else
+            platform_params = { :pylibmc_package_name => 'python-pylibmc' }
+          end
+        when 'RedHat'
+          platform_params = { :pylibmc_package_name => 'python-pylibmc' }
+        end
 
         case facts[:osfamily]
         when 'Debian'
-          platform_params[:python_memcache_package_name] = 'python-memcache'
+          if facts[:os_package_type] == 'debian'
+            platform_params[:python_memcache_package_name] = 'python3-memcache'
+          else
+            platform_params[:python_memcache_package_name] = 'python-memcache'
+          end
         when 'RedHat'
           platform_params[:python_memcache_package_name] = 'python-memcached'
         end