From d532057da78cf03b0f024af4e443b78a9e3a68b0 Mon Sep 17 00:00:00 2001 From: Adam Saleh Date: Tue, 20 Oct 2020 09:21:59 +0200 Subject: [PATCH] Wrong name for the monitor-dashboard datasource config --- playbooks/openshift-apps/monitor_dashboard.yml | 9 +++++---- .../monitor-dashboard/templates/deploymentconfig.yml | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/playbooks/openshift-apps/monitor_dashboard.yml b/playbooks/openshift-apps/monitor_dashboard.yml index bc11bff0f0..dc74e7d199 100644 --- a/playbooks/openshift-apps/monitor_dashboard.yml +++ b/playbooks/openshift-apps/monitor_dashboard.yml @@ -40,10 +40,11 @@ file: service.yml objectname: service.yml - - role: openshift/object - app: monitor-dashboard - file: route.yml - objectname: route.yml +# Route already present, will figure updating later +# - role: openshift/object +# app: monitor-dashboard +# file: route.yml +# objectname: route.yml - role: openshift/object app: monitor-dashboard diff --git a/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml b/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml index 5200083c67..df075b4b12 100644 --- a/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml +++ b/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml @@ -44,15 +44,15 @@ spec: - containerPort: 3000 volumeMounts: - mountPath: /etc/grafana/provisioning/datasources - name: grafana-datasources-provision + name: grafana-datasources - mountPath: /etc/grafana/provisioning/dashboards name: grafana-dashboards-provision - mountPath: /var/lib/grafana/dashboards name: grafana-dashboards volumes: - configMap: - name: grafana-datasources-provision - name: grafana-datasources-provision + name: grafana-datasources + name: grafana-datasources - configMap: name: grafana-dashboards-provision name: grafana-dashboards-provision