From c75d6cd6e497592acaa6de1daf7e8938d17bc3d3 Mon Sep 17 00:00:00 2001
From: Adam Saleh <asaleh@redhat.com>
Date: Oct 20 2020 11:28:53 +0000
Subject: Wirking around the datanommer password special chars for monitor dashboard by puttin it in env-var


---

diff --git a/playbooks/openshift-apps/monitor_dashboard.yml b/playbooks/openshift-apps/monitor_dashboard.yml
index 23e4288..7678138 100644
--- a/playbooks/openshift-apps/monitor_dashboard.yml
+++ b/playbooks/openshift-apps/monitor_dashboard.yml
@@ -35,6 +35,12 @@
     template: dashboard_config.yml
     objectname: dashboard_config.yml
 
+
+  - role: openshift/object
+    app: monitor-dashboard
+    file: secret.yml
+    objectname: secret.yml
+
   - role: openshift/object
     app: monitor-dashboard
     file: service.yml
diff --git a/roles/openshift-apps/monitor-dashboard/files/secret.yml b/roles/openshift-apps/monitor-dashboard/files/secret.yml
new file mode 100644
index 0000000..dbed0fa
--- /dev/null
+++ b/roles/openshift-apps/monitor-dashboard/files/secret.yml
@@ -0,0 +1,6 @@
+- apiVersion: v1
+  data:
+    DATANOMER_PWD: {{ datanommer_ro_password }}
+  kind: Secret
+  metadata:
+    name: datanommer-secret
diff --git a/roles/openshift-apps/monitor-dashboard/templates/configmap.yml b/roles/openshift-apps/monitor-dashboard/templates/configmap.yml
index 8c1a695..c19bd87 100644
--- a/roles/openshift-apps/monitor-dashboard/templates/configmap.yml
+++ b/roles/openshift-apps/monitor-dashboard/templates/configmap.yml
@@ -13,9 +13,10 @@ data:
         type: postgres
         url: db-datanommer01.iad2.fedoraproject.org:5432
         database: datanommer
+        default: true
         user: datanommer_ro
         secureJsonData:
-          password: "{{ datanommer_ro_password }}"
+          password: "$DATANOMER_PWD"
         jsonData:
           sslmode: "disable" # disable/require/verify-ca/verify-full
           maxOpenConns: 0         # Grafana v5.4+
diff --git a/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml b/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml
index 1177ae9..dab4599 100644
--- a/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml
+++ b/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml
@@ -17,7 +17,10 @@ spec:
       name: dashboard
     spec:
       containers:
-        - env:
+        - envFrom:
+          - secretRef:
+            name: datanommer-secret
+          env:
             - name: GF_INSTALL_PLUGINS
               value: "grafana-clock-panel,simpod-json-datasource,grafana-googlesheets-datasource"
             - name: GF_AUTH_BASIC_ENABLED