From a58ef362a9834dbc623f4fa97e9665809002f280 Mon Sep 17 00:00:00 2001
From: Tobias Urdin <tobias.urdin@binero.se>
Date: Wed, 27 May 2020 12:06:26 +0200
Subject: [PATCH] Install the correct memcache bindings for py3

Change-Id: I51184bb0153f2754dc6bc0d445020d218f6ecc3a
(cherry picked from commit 3fa63db9387e7f0910d4e1138b053a5055066f89)
---
 manifests/params.pp                                    |  2 +-
 .../memcache-package-pyvers-a3db976c1a881dcf.yaml      |  5 +++++
 spec/defines/keystone_resource_authtoken_spec.rb       | 10 +++++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 releasenotes/notes/memcache-package-pyvers-a3db976c1a881dcf.yaml

diff --git a/manifests/params.pp b/manifests/params.pp
index 62c235003..060339819 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -23,7 +23,7 @@ class keystone::params {
       $package_name                 = 'openstack-keystone'
       $service_name                 = 'openstack-keystone'
       $keystone_wsgi_script_path    = '/var/www/cgi-bin/keystone'
-      $python_memcache_package_name = 'python-memcached'
+      $python_memcache_package_name = "python${pyvers}-memcached"
       $mellon_package_name          = 'mod_auth_mellon'
       $openidc_package_name         = 'mod_auth_openidc'
     }
diff --git a/releasenotes/notes/memcache-package-pyvers-a3db976c1a881dcf.yaml b/releasenotes/notes/memcache-package-pyvers-a3db976c1a881dcf.yaml
new file mode 100644
index 000000000..cbd4b2a1f
--- /dev/null
+++ b/releasenotes/notes/memcache-package-pyvers-a3db976c1a881dcf.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixed a bug where the keystone::resource::authtoken resource would not
+    install the proper python memcache bindings when using python3.
diff --git a/spec/defines/keystone_resource_authtoken_spec.rb b/spec/defines/keystone_resource_authtoken_spec.rb
index 30430ad31..62db4fcfb 100644
--- a/spec/defines/keystone_resource_authtoken_spec.rb
+++ b/spec/defines/keystone_resource_authtoken_spec.rb
@@ -211,7 +211,15 @@ describe 'keystone::resource::authtoken' do
         when 'Debian'
           memcache_package_name = 'python3-memcache'
         when 'RedHat'
-          memcache_package_name = 'python-memcached'
+          if facts[:operatingsystem] == 'Fedora'
+            memcache_package_name = 'python3-memcached'
+          else
+            if facts[:operatingsystemmajrelease] > '7'
+              memcache_package_name = 'python3-memcached'
+            else
+              memcache_package_name = 'python-memcached'
+            end
+          end
         end
         {
           :memcache_package_name => memcache_package_name