From 426d9b7b631bcabc77dccec770f2cf40eb501b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 10 Oct 2019 12:59:08 +0200
Subject: [PATCH] We have differnt vars files for staging and prod, use them
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               | 5 ++---
 inventory/group_vars/bodhi2_stg           | 5 ++++-
 playbooks/openshift-apps/bodhi.yml        | 8 --------
 roles/bodhi2/base/templates/configmap.yml | 1 -
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/inventory/group_vars/bodhi2 b/inventory/group_vars/bodhi2
index 9c597358b4..e19f439065 100644
--- a/inventory/group_vars/bodhi2
+++ b/inventory/group_vars/bodhi2
@@ -15,9 +15,8 @@ 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
+# Fixed Bodhi version
+bodhi_version: 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
diff --git a/inventory/group_vars/bodhi2_stg b/inventory/group_vars/bodhi2_stg
index 8226ec11e2..ed814af5ad 100644
--- a/inventory/group_vars/bodhi2_stg
+++ b/inventory/group_vars/bodhi2_stg
@@ -1,5 +1,5 @@
 ---
-# Define resources for this group of hosts here. 
+# Define resources for this group of hosts here.
 jobrunner: false
 epelmasher: false
 
@@ -13,6 +13,9 @@ num_cpus: 2
 # Use the infra-testing repo
 testing: True
 
+# Fixed Bodhi version
+bodhi_version: 5.0.0-0.beta.1.761b898.fc30.infra
+
 # configure mod_wsgi to use the vars for its own setup
 wsgi_procs: 2
 wsgi_threads: 2
diff --git a/playbooks/openshift-apps/bodhi.yml b/playbooks/openshift-apps/bodhi.yml
index 4d623890c5..4fbb2b5204 100644
--- a/playbooks/openshift-apps/bodhi.yml
+++ b/playbooks/openshift-apps/bodhi.yml
@@ -76,14 +76,6 @@
     app: bodhi
     template: buildconfig.yml
     objectname: buildconfig.yml
-    bodhi_version: "{{ bodhi_version_staging }}"
-    when: env == "staging"
-  - role: openshift/object
-    app: bodhi
-    template: buildconfig.yml
-    objectname: buildconfig.yml
-    bodhi_version: "{{ bodhi_version_production }}"
-    when: env == "production"
   - role: openshift/start-build
     app: bodhi
     buildname: bodhi-base
diff --git a/roles/bodhi2/base/templates/configmap.yml b/roles/bodhi2/base/templates/configmap.yml
index 4914911af0..ff3aa76a78 100644
--- a/roles/bodhi2/base/templates/configmap.yml
+++ b/roles/bodhi2/base/templates/configmap.yml
@@ -1,5 +1,4 @@
 {%- macro load_file(filename) %}{% include filename %}{%- endmacro -%}
-{%- set bodhi_version = (env == 'production')|ternary(bodhi_version_production, bodhi_version_staging) -%}
 ---
 apiVersion: v1
 kind: ConfigMap