[connfa-web] Make sure secrets are properly referenced

[Andrea Veri <averi src gnome org>]

commit 76620073093511820c2ec2e28507fb24982a034a
Author: Andrea Veri <averi redhat com>
Date:   Tue Jun 18 18:02:36 2019 +0200

    Make sure secrets are properly referenced

 oscp.yaml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/oscp.yaml b/oscp.yaml
index 84c5bf7..211d042 100644
--- a/oscp.yaml
+++ b/oscp.yaml
@@ -44,7 +44,7 @@ parameters:
   required: true
 - description: Password for the Connfa admin user.
   displayName: Connfa Admin Password
-  name: CONNFA_ADMIN_PASS
+  name: CONNFA_ADMIN_PASSWORD
   required: true
 - description: URL at which Connfa will handle requests
   displayName: Connfa Application URL
@@ -123,6 +123,10 @@ objects:
                 key: database-name
           - name: CONNFA_MYSQL_HOST
             value: "${CONNFA_NAME}-mariadb"
+            valueFrom:
+              secretKeyRef:
+                name: "${CONNFA_NAME}-mariadb"
+                key: database-host
           - name: CONNFA_ADMIN_PASS
             valueFrom:
               secretKeyRef:
@@ -213,10 +217,12 @@ objects:
       template.openshift.io/expose-database_name: "{.data['database-name']}"
       template.openshift.io/expose-password: "{.data['database-password']}"
       template.openshift.io/expose-username: "{.data['database-user']}"
+      template.openshift.io/expose-database_host: "{.data['database-host']}"
   stringData:
     database-name: "${MYSQL_DATABASE_NAME}"
     database-password: "${MYSQL_PASSWORD}"
     database-user: "${MYSQL_USER}"
+    database-host: "${MYSQL_DATABASE_HOST}"
 - kind: Secret
   apiVersion: v1
   metadata:
@@ -236,7 +242,7 @@ objects:
     annotations:
       description: Connfa application key
   stringData:
-    admin-password: "${CONNFA_APP_KEY}"
+    app-key: "${CONNFA_APP_KEY}"
 - apiVersion: build.openshift.io/v1
   kind: "BuildConfig"
   metadata: