diff --git a/playbooks/openshift-apps/monitor_dashboard.yml b/playbooks/openshift-apps/monitor_dashboard.yml index 987ba352a4..23e42882b2 100644 --- a/playbooks/openshift-apps/monitor_dashboard.yml +++ b/playbooks/openshift-apps/monitor_dashboard.yml @@ -35,12 +35,6 @@ template: dashboard_config.yml objectname: dashboard_config.yml - - - role: openshift/object - app: monitor-dashboard - template: secret.yml - objectname: secret.yml - - role: openshift/object app: monitor-dashboard file: service.yml diff --git a/roles/openshift-apps/monitor-dashboard/templates/configmap.yml b/roles/openshift-apps/monitor-dashboard/templates/configmap.yml index c19bd871b0..fd1c5fb316 100644 --- a/roles/openshift-apps/monitor-dashboard/templates/configmap.yml +++ b/roles/openshift-apps/monitor-dashboard/templates/configmap.yml @@ -16,7 +16,7 @@ data: default: true user: datanommer_ro secureJsonData: - password: "$DATANOMER_PWD" + password: {{ datanommer_ro_password }} jsonData: sslmode: "disable" # disable/require/verify-ca/verify-full maxOpenConns: 0 # Grafana v5.4+ diff --git a/roles/openshift-apps/monitor-dashboard/templates/secret.yml b/roles/openshift-apps/monitor-dashboard/templates/secret.yml deleted file mode 100644 index d2f92ce6e4..0000000000 --- a/roles/openshift-apps/monitor-dashboard/templates/secret.yml +++ /dev/null @@ -1,6 +0,0 @@ -- apiVersion: v1 - data: - DATANOMER_PWD: "{{ datanommer_ro_password | b64encode }}" - kind: Secret - metadata: - name: datanommer-secret