From 2a6219ccfdec2570da2b9ea90146a12cf481aa52 Mon Sep 17 00:00:00 2001
From: Matt Jia <mjia@redhat.com>
Date: Fri, 20 Oct 2017 14:14:57 +1000
Subject: [PATCH] greenwave: add memcached pod in OpenShift

---
 .../greenwave/files/deploymentconfig.yml      | 30 ++++++++++++++++++-
 .../greenwave/files/service.yml               | 15 ++++++++++
 .../greenwave/templates/configmap.yml         | 21 +++++++++----
 3 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/roles/openshift-apps/greenwave/files/deploymentconfig.yml b/roles/openshift-apps/greenwave/files/deploymentconfig.yml
index 1158312af4..acf6b27329 100644
--- a/roles/openshift-apps/greenwave/files/deploymentconfig.yml
+++ b/roles/openshift-apps/greenwave/files/deploymentconfig.yml
@@ -115,4 +115,32 @@ spec:
         kind: ImageStreamTag
         name: greenwave:latest
   - type: ConfigChange
- 
+---
+# For memcached
+apiVersion: v1
+kind: DeploymentConfig
+metadata:
+  name: greenwave-memcached
+  labels:
+    app: greenwave
+    service: greenwave-memcached
+spec:
+  replicas: 1
+  selector:
+    service: greenwave-memcached
+  template:
+    metadata:
+      labels:
+        app: greenwave
+        service: greenwave-memcached
+    spec:
+      containers:
+      - name: greenwave-memcached
+        image: registry.fedoraproject.org/memcached:26
+        ports:
+        - containerPort: 11211
+        resources:
+          limits:
+            memory: 384Mi
+  triggers:
+  - type: ConfigChange
diff --git a/roles/openshift-apps/greenwave/files/service.yml b/roles/openshift-apps/greenwave/files/service.yml
index 914e9a6d4e..9e79690618 100644
--- a/roles/openshift-apps/greenwave/files/service.yml
+++ b/roles/openshift-apps/greenwave/files/service.yml
@@ -28,3 +28,18 @@ spec:
   - name: fedmsg-consumers
     port: 8081
     targetPort: 8081
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: greenwave-memcached
+  labels:
+    app: greenwave
+spec:
+  selector:
+    app: greenwave
+    service: greenwave-memcached
+  ports:
+  - name: greenwave-memcached
+    port: 11211
+    targetPort: 11211
diff --git a/roles/openshift-apps/greenwave/templates/configmap.yml b/roles/openshift-apps/greenwave/templates/configmap.yml
index c74b28ed46..64798c7c6b 100644
--- a/roles/openshift-apps/greenwave/templates/configmap.yml
+++ b/roles/openshift-apps/greenwave/templates/configmap.yml
@@ -20,8 +20,14 @@ data:
     WAIVERDB_API_URL = 'https://waiverdb-web-waiverdb.app.os.fedoraproject.org/api/v1.0'
     CORS_URL = 'https://bodhi.fedoraproject.org'
 {% endif %}
-    # XXX: change to dbm backend with persistent volume.
-    CACHE = {'backend': 'dogpile.cache.memory'}
+    CACHE = {
+        'backend': 'dogpile.cache.memcached',
+        'expiration_time': 3600, # 3600 is 1 hour
+        'arguments': {
+            'url': 'greenwave-memcached:11211',
+            'distributed_lock': True
+        }
+    }
   fedora.yaml: |-
     --- !Policy
     id: "openqa_important_stuff_for_rawhide"
@@ -229,8 +235,6 @@ data:
   greenwave.py: |-
     import socket
     config = dict(
-      # XXX: change to dbm backend with persistent volume.
-      greenwave_cache={'backend': 'dogpile.cache.null'},
       sign_messages=True,
       active=True,
 
@@ -256,7 +260,14 @@ data:
               }
           },
       },
-
+      greenwave_cache={
+          'backend': 'dogpile.cache.memcached',
+          'expiration_time': 3600, # 3600 is 1 hour
+          'arguments': {
+              'url': 'greenwave-memcached:11211',
+              'distributed_lock': True
+          }
+      },
 {% if env == 'staging' %}
       environment='stg',
       relay_inbound=["tcp://busgateway01.stg.phx2.fedoraproject.org:9941"],