From 70866fd5326d8e118b23160f47b12cdcb047f61a Mon Sep 17 00:00:00 2001
From: Tim Flink <tflink@fedoraproject.org>
Date: Tue, 15 Aug 2017 18:06:46 +0000
Subject: [PATCH] making stg/prod differences in blockerbugs more sane

---
 inventory/group_vars/blockerbugs                |  7 +++++--
 inventory/group_vars/blockerbugs-stg            |  7 +++++++
 .../templates/blockerbugs-settings.py.j2        | 17 +++--------------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/inventory/group_vars/blockerbugs b/inventory/group_vars/blockerbugs
index 0f3883e749..49c18a2908 100644
--- a/inventory/group_vars/blockerbugs
+++ b/inventory/group_vars/blockerbugs
@@ -20,6 +20,9 @@ master_blockerbugs_node: False
 host_group: blockerbugs
 
 blockerbugs_secret_key: "{{ stg_blockerbugs_secret_key }}"
+blockerbugs_bugzilla_url: 'https://bugzilla.redhat.com/'
+blockerbugs_bodhi_url: 'https://bodhi.fedoraproject.org/'
+blockerbugs_koji_url: "http://koji.fedoraproject.org/"
 
 ############################################################
 # blockerbugs db details
@@ -30,6 +33,6 @@ blockerbugs_db_host: "{{ blockerbugs_db_host_machine }}"
 blockerbugs_db_port: 5432
 blockerbugs_db_name: blockerbugs
 # these aren't right but they're just placeholders for now
-blockerbugs_db_user: "{{ stg_blockerbugs_db_user }}"
-blockerbugs_db_password: "{{ stg_blockerbugs_db_password }}"
+blockerbugs_db_user: "{{ prod_blockerbugs_db_user }}"
+blockerbugs_db_password: "{{ prod_blockerbugs_db_password }}"
 
diff --git a/inventory/group_vars/blockerbugs-stg b/inventory/group_vars/blockerbugs-stg
index ed2e8ae990..51bf6a047d 100644
--- a/inventory/group_vars/blockerbugs-stg
+++ b/inventory/group_vars/blockerbugs-stg
@@ -19,6 +19,13 @@ master_blockerbugs_node: False
 
 blockerbugs_secret_key: "{{ stg_blockerbugs_secret_key }}"
 
+blockerbugs_bugzilla_url: 'https://bugzilla.redhat.com/'
+blockerbugs_bodhi_url: 'https://bodhi.fedoraproject.org/'
+blockerbugs_koji_url: "http://koji.fedoraproject.org/"
+# these are to use stg stuff but that often doesn't work well
+#blockerbugs_bugzilla_url: 'https://partner-bugzilla.redhat.com/'
+#blockerbugs_bodhi_url: 'https://bodhi.stg.fedoraproject.org/'
+
 ############################################################
 # blockerbugs db details
 ############################################################
diff --git a/roles/blockerbugs/templates/blockerbugs-settings.py.j2 b/roles/blockerbugs/templates/blockerbugs-settings.py.j2
index 4b692659b4..03876c1142 100644
--- a/roles/blockerbugs/templates/blockerbugs-settings.py.j2
+++ b/roles/blockerbugs/templates/blockerbugs-settings.py.j2
@@ -1,9 +1,5 @@
 SECRET_KEY = '{{ blockerbugs_secret_key }}'
-{% if env == "staging" %}
 SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ blockerbugs_db_user }}:{{ blockerbugs_db_password }}@{{ blockerbugs_db_host }}:{{ blockerbugs_db_port }}/{{ blockerbugs_db_name }}'
-{% else %}
-SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://{{ blockerbugs_app }}:{{ blockerbugs_appPassword }}@db-blockerbugs/blockerbugs'
-{% endif %}
 FAS_ADMIN_GROUP = "qa-admin"
 FAS_USER = "{{ blockerbugs_fas_user }}@fedoraproject.org"
 FAS_PASSWORD = "{{ blockerbugs_fas_password }}"
@@ -11,18 +7,11 @@ FAS_PASSWORD = "{{ blockerbugs_fas_password }}"
 FAS_FLASK_COOKIE_REQUIRES_HTTPS = False
 FAS_CHECK_CERT = False
 PRODUCTION = False
-# maybe this should be pointing at staging but that makes
-# the app really difficult to test because the data is so old
-#BUGZILLA_URL = 'https://partner-bugzilla.redhat.com/'
-#BODHI_URL = 'https://bodhi.stg.fedoraproject.org/'
-BUGZILLA_URL = 'https://bugzilla.redhat.com/'
-BODHI_URL = 'https://bodhi.fedoraproject.org/'
-{% else %}
-BUGZILLA_URL = 'https://bugzilla.redhat.com/'
-BODHI_URL = 'https://bodhi.fedoraproject.org/'
 {% endif %}
+BUGZILLA_URL = '{{ blockerbugs_bugzilla_url }}'
+BODHI_URL = '{{ blockerbugs_bodhi_url }}'
 BUGZILLA_XMLRPC = BUGZILLA_URL + 'xmlrpc.cgi'
-KOJI_URL = "http://koji.fedoraproject.org/"
+KOJI_URL = "{{ blockerbugs_bugzilla_url }}"
 FILE_LOGGING = False
 SYSLOG_LOGGING = True
 STREAM_LOGGING = True