From c99ece376c4d401628ab04dfa3a6e61dec8920bd Mon Sep 17 00:00:00 2001
From: Randy Barlow <randy@electronsweatshop.com>
Date: Mon, 23 Apr 2018 16:26:27 +0000
Subject: [PATCH] Use Bodhi 3.6.1 on staging (and openshift, which isn't prod
 atm).

This commit also adjusts Bodhi to use dogpile cache's in-memory
backend, and adjusts the backend01 to install bodhi-composer.

Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
---
 playbooks/openshift-apps/bodhi.yml            | 2 +-
 roles/bodhi2/backend/tasks/main.yml           | 7 +++++++
 roles/bodhi2/base/templates/production.ini.j2 | 6 ++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml
index a11d9e1200..9ed2fd6ec3 100644
--- a/playbooks/openshift-apps/bodhi.yml
+++ b/playbooks/openshift-apps/bodhi.yml
@@ -51,7 +51,7 @@
     app: bodhi
     template: buildconfig.yml
     objectname: buildconfig.yml
-    bodhi_version: 3.6.0
+    bodhi_version: 3.6.1-0.0.beta
   - role: openshift/start-build
     app: bodhi
     buildname: bodhi-web
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index 03c6fe17da..d0d1e1fe2d 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -48,6 +48,13 @@
   - packages
   - bodhi
 
+- name: install bodhi-composer
+  package: name=bodhi-composer state=present
+  when: inventory_hostname.startswith('bodhi-backend01') and env == "staging"
+  tags:
+  - packages
+  - bodhi
+
 - name: install ostree
   package: name=ostree state=present
   when: inventory_hostname.startswith('bodhi-backend01')
diff --git a/roles/bodhi2/base/templates/production.ini.j2 b/roles/bodhi2/base/templates/production.ini.j2
index 7087a7d7b1..15d7ff82ad 100644
--- a/roles/bodhi2/base/templates/production.ini.j2
+++ b/roles/bodhi2/base/templates/production.ini.j2
@@ -341,7 +341,13 @@ top_testers_timeframe = 900
 # dogpile.cache.backend = dogpile.cache.dbm
 # dogpile.cache.expiration_time = 100
 # dogpile.cache.arguments.filename = /var/cache/bodhi-dogpile-cache.dbm
+{% if env == "staging" %}
+dogpile.cache.backend = dogpile.cache.memory_pickle
+# Cache expires every 6 hours.
+dogpile.cache.expiration_time = 21600
+{% else %}
 dogpile.cache.arguments.filename = /var/cache/bodhi/dogpile-cache.dbm
+{% endif %}
 
 # Exclude sending emails to these users
 # exclude_mail = autoqa taskotron