Make the Bodhi versions more widely available

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>

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

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

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