From 771df740755ffe1671362b15e4733972874086fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kone=C4=8Dn=C3=BD?= <mkonecny@redhat.com>
Date: Tue, 11 Jun 2019 17:24:23 +0200
Subject: [PATCH] waiverdb: separate config files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
---
 .../waiverdb/templates/configmap.yml          | 20 +++----------------
 .../waiverdb/templates/settings.py            | 16 +++++++++++++++
 2 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 roles/openshift-apps/waiverdb/templates/settings.py

diff --git a/roles/openshift-apps/waiverdb/templates/configmap.yml b/roles/openshift-apps/waiverdb/templates/configmap.yml
index a6d02fd136..fcda092b91 100644
--- a/roles/openshift-apps/waiverdb/templates/configmap.yml
+++ b/roles/openshift-apps/waiverdb/templates/configmap.yml
@@ -1,3 +1,5 @@
+{% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
+---
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -6,22 +8,7 @@ metadata:
     app: waiverdb
 data:
   settings.py: |-
-{% if env == 'staging' %}
-    DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.stg.phx2.fedoraproject.org:5432/waiverdb'
-    RESULTSDB_API_URL = 'https://taskotron.stg.fedoraproject.org/resultsdb_api/api/v2.0'
-    CORS_URL = 'https://bodhi.stg.fedoraproject.org'
-    MESSAGE_BUS_PUBLISH = True
-{% else %}
-    DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.phx2.fedoraproject.org:5432/waiverdb'
-    RESULTSDB_API_URL = 'https://taskotron.fedoraproject.org/resultsdb_api/api/v2.0'
-    CORS_URL = 'https://bodhi.fedoraproject.org'
-    MESSAGE_BUS_PUBLISH = False
-{% endif %}
-    AUTH_METHOD = 'OIDC'
-    OIDC_REQUIRED_SCOPE = 'https://waiverdb.fedoraproject.org/oidc/create-waiver'
-    OIDC_CLIENT_SECRETS = '/etc/secret/client_secrets.json'
-    SUPERUSERS = ['bodhi@service']
-    PORT = 8080
+    {{ load_file('settings.py') | indent }}
 ---
 apiVersion: v1
 kind: ConfigMap
@@ -29,7 +16,6 @@ metadata:
   name: fedora-messaging-configmap
   labels:
     app: waiverdb
-{% macro load_file(filename) %}{% include filename %}{%- endmacro -%}
 data:
   config.toml: |-
     {{ load_file('config.toml') | indent }}
diff --git a/roles/openshift-apps/waiverdb/templates/settings.py b/roles/openshift-apps/waiverdb/templates/settings.py
new file mode 100644
index 0000000000..ef6fab4c99
--- /dev/null
+++ b/roles/openshift-apps/waiverdb/templates/settings.py
@@ -0,0 +1,16 @@
+{% if env == 'staging' %}
+DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.stg.phx2.fedoraproject.org:5432/waiverdb'
+RESULTSDB_API_URL = 'https://taskotron.stg.fedoraproject.org/resultsdb_api/api/v2.0'
+CORS_URL = 'https://bodhi.stg.fedoraproject.org'
+MESSAGE_BUS_PUBLISH = True
+{% else %}
+DATABASE_URI = 'postgresql+psycopg2://waiverdb@db01.phx2.fedoraproject.org:5432/waiverdb'
+RESULTSDB_API_URL = 'https://taskotron.fedoraproject.org/resultsdb_api/api/v2.0'
+CORS_URL = 'https://bodhi.fedoraproject.org'
+MESSAGE_BUS_PUBLISH = False
+{% endif %}
+AUTH_METHOD = 'OIDC'
+OIDC_REQUIRED_SCOPE = 'https://waiverdb.fedoraproject.org/oidc/create-waiver'
+OIDC_CLIENT_SECRETS = '/etc/secret/client_secrets.json'
+SUPERUSERS = ['bodhi@service']
+PORT = 8080