From cfb47826bb9d9a58bbe2f5935dbdc45d490b55b0 Mon Sep 17 00:00:00 2001
From: Clement Verna <cverna@tutanota.com>
Date: Wed, 26 Sep 2018 14:04:04 +0200
Subject: [PATCH] Use a json config file for fpdc configmap

Signed-off-by: Clement Verna <cverna@tutanota.com>
---
 .../fpdc/files/deploymentconfig.yml           |  2 +-
 .../fpdc/templates/configmap.yml              | 39 ++++---------------
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/roles/openshift-apps/fpdc/files/deploymentconfig.yml b/roles/openshift-apps/fpdc/files/deploymentconfig.yml
index cf51356312..823800db3a 100644
--- a/roles/openshift-apps/fpdc/files/deploymentconfig.yml
+++ b/roles/openshift-apps/fpdc/files/deploymentconfig.yml
@@ -27,7 +27,7 @@ spec:
           protocol: TCP
         volumesMounts:
           - name: config-volume
-            mountPath: /opt/app-root/src/fpdc/settings/
+            mountPath: /opt/app-root/config/
             readOnly: true
         readinessProbe:
           timeoutSeconds: 1
diff --git a/roles/openshift-apps/fpdc/templates/configmap.yml b/roles/openshift-apps/fpdc/templates/configmap.yml
index a11198d964..bff4b26b36 100644
--- a/roles/openshift-apps/fpdc/templates/configmap.yml
+++ b/roles/openshift-apps/fpdc/templates/configmap.yml
@@ -6,38 +6,15 @@ metadata:
   labels:
     app: fpdc
 data:
-  prod.py: |-
-    # Django settings for fpdc project.
-    from base import  *
-
+  config.json: |-
+    {
 {% if env == 'staging' %}
-    SECRET_KEY = '{{ stg_fpdc_secret_key }}'
+    "SECRET_KEY": "{{ stg_fpdc_secret_key }}",
+    "DB_PASSWORD": "{{ fpdc_stg_db_pass }}",
+    "DB_HOST": "{{ fpdc_stg_db_server }}"
 {% else %}
-    SECRET_KEY = '{{ fpdc_secret_key }}'
+    "SECRET_KEY": "{{ fpdc_secret_key }}",
+    "DB_PASSWORD": "{{ fpdc_db_pass }}",
+    "DB_HOST": "{{ fpdc_db_server }}"
 {% endif %}
-
-    DEBUG = False
-    ALLOWED_HOSTS = []
-{% if env == 'staging' %}
-    DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'fpdc',
-        'USER': 'fpdc',
-        'PASSWORD': '{{ fpdc_stg_db_pass }}',
-        'HOST': '{{ fpdc_stg_db_server }}',
-        'PORT': '',
-      }
     }
-{% else %}
-    DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.postgresql',
-        'NAME': 'fpdc',
-        'USER': 'fpdc',
-        'PASSWORD': '{{ fpdc_db_pass }}',
-        'HOST': '{{ fpdc_db_server }}',
-        'PORT': '',
-      }
-    }
-{% endif %}