From f401a80fc5b0d59b64336404b74751ea9a1f33d8 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 20 May 2019 14:21:49 +1000
Subject: [PATCH] Move redis definition

It seems this package name conflicts; I guess testing must not enable
redis because this wasn't picked up in CI tests.

Move it into the redis section and disambiguate package names

Change-Id: Ibc616346b12c4699652702778755695c0bf9f7c2
---
 manifests/install.pp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/manifests/install.pp b/manifests/install.pp
index 5f5b6a7..75529ee 100644
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -70,7 +70,18 @@ class askbot::install (
   }
 
   if $redis_enabled {
+
+    # This seems to be the only version that works; after this start
+    # getting errors about CacheKey input types; you can search and find
+    # this is something to do with redis 3.
     python::pip { 'redis':
+      ensure     => '2.10.3',
+      pkgname    => 'redis',
+      virtualenv => '/usr/askbot-env',
+      require    => Python::Virtualenv['/usr/askbot-env'],
+    }
+
+    python::pip { 'django-redis-cache':
       ensure     => '1.3.0',
       pkgname    => 'django-redis-cache',
       virtualenv => '/usr/askbot-env',
@@ -121,16 +132,6 @@ class askbot::install (
     require    => Python::Virtualenv['/usr/askbot-env'],
   }
 
-  # This seems to be the only version that works; after this start
-  # getting errors about CacheKey input types; you can search and find
-  # this is something to do with redis 3.
-  python::pip { 'redis':
-    ensure     => '2.10.3',
-    pkgname    => 'redis',
-    virtualenv => '/usr/askbot-env',
-    require    => Python::Virtualenv['/usr/askbot-env'],
-  }
-
   include ::httpd::mod::wsgi
 
   exec { 'askbot-install':