From 116ced33347d9f325a8867e72d5dc503baf12a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 10 Oct 2019 12:49:25 +0200
Subject: [PATCH] Make the Bodhi versions more widely available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 inventory/group_vars/bodhi2               | 6 +++++-
 playbooks/openshift-apps/bodhi.yml        | 4 ++--
 roles/bodhi2/base/templates/configmap.yml | 1 +
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/inventory/group_vars/bodhi2 b/inventory/group_vars/bodhi2
index 8e83bacf7e..9c597358b4 100644
--- a/inventory/group_vars/bodhi2
+++ b/inventory/group_vars/bodhi2
@@ -1,5 +1,5 @@
 ---
-# Define resources for this group of hosts here. 
+# Define resources for this group of hosts here.
 jobrunner: false
 epelmasher: false
 
@@ -15,6 +15,10 @@ testing: False
 
 host_group: bodhi2
 
+# Fixed Bodhi versions
+bodhi_version_staging: 5.0.0-0.beta.1.761b898.fc30.infra
+bodhi_version_production: 4.1.1-1.fc29.infra
+
 # Definining these vars has a number of effects
 # 1) mod_wsgi is configured to use the vars for its own setup
 # 2) iptables opens enough ports for all threads for fedmsg
diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml
index 27a3bb863f..4d623890c5 100644
--- a/playbooks/openshift-apps/bodhi.yml
+++ b/playbooks/openshift-apps/bodhi.yml
@@ -76,13 +76,13 @@
     app: bodhi
     template: buildconfig.yml
     objectname: buildconfig.yml
-    bodhi_version: 5.0.0-0.beta.1.761b898.fc30.infra
+    bodhi_version: "{{ bodhi_version_staging }}"
     when: env == "staging"
   - role: openshift/object
     app: bodhi
     template: buildconfig.yml
     objectname: buildconfig.yml
-    bodhi_version: 4.1.1-1.fc29.infra
+    bodhi_version: "{{ bodhi_version_production }}"
     when: env == "production"
   - role: openshift/start-build
     app: bodhi
diff --git a/roles/bodhi2/base/templates/configmap.yml b/roles/bodhi2/base/templates/configmap.yml
index ff3aa76a78..4914911af0 100644
--- a/roles/bodhi2/base/templates/configmap.yml
+++ b/roles/bodhi2/base/templates/configmap.yml
@@ -1,4 +1,5 @@
 {%- macro load_file(filename) %}{% include filename %}{%- endmacro -%}
+{%- set bodhi_version = (env == 'production')|ternary(bodhi_version_production, bodhi_version_staging) -%}
 ---
 apiVersion: v1
 kind: ConfigMap