From ded44bdb34bab2237c5d86f385ade3bcedd28b90 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Mon, 29 Apr 2019 12:23:45 +0200
Subject: [PATCH] elections: mount the secret volume and point elections to it

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
---
 roles/openshift-apps/elections/files/deploymentconfig.yml  | 7 +++++++
 .../elections/templates/fedora-elections.cfg               | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/roles/openshift-apps/elections/files/deploymentconfig.yml b/roles/openshift-apps/elections/files/deploymentconfig.yml
index 2577c792ae..fec491aa67 100644
--- a/roles/openshift-apps/elections/files/deploymentconfig.yml
+++ b/roles/openshift-apps/elections/files/deploymentconfig.yml
@@ -24,6 +24,7 @@ spec:
             value: /opt/app-root/src
           volumes:
             - config-volume
+            - secret-volume
   template:
     metadata:
       labels:
@@ -40,6 +41,9 @@ spec:
         - name: config-volume
           mountPath: /opt/app-root/config/
           readOnly: true
+        - name: secret-volume:
+          mountPath: /opt/app-root/secret/
+          readOnly: true
         - name: fedora-messaging-ca-volume
           mountPath: /etc/pki/rabbitmq/ca
           readOnly: true
@@ -65,6 +69,9 @@ spec:
       - name: config-volume
         configMap:
           name: elections-configmap
+      - name: secret-volume:
+        secret:
+            secretName: elections-secret
       - name: fedora-messaging-ca-volume
         secret:
           secretName: elections-fedora-messaging-ca
diff --git a/roles/openshift-apps/elections/templates/fedora-elections.cfg b/roles/openshift-apps/elections/templates/fedora-elections.cfg
index 96b03d9b9b..4d39f2117b 100644
--- a/roles/openshift-apps/elections/templates/fedora-elections.cfg
+++ b/roles/openshift-apps/elections/templates/fedora-elections.cfg
@@ -17,6 +17,8 @@ DB_URL='postgresql://{{ elections_db_user }}:{{ elections_db_pass }}@db01.phx2.f
 FEDORA_ELECTIONS_ADMIN_GROUP = 'elections'
 
 
+OIDC_CLIENT_SECRETS = '/opt/app-root/secret/client_secrets.json'
+
 ## Fedora-elections can integrate with FAS to retrieve information about the
 ## candidates, the following configuration keys are required for this
 ## integration.