From e44f6e9a0c6c4a4a68aa97a75f5c3aef4bad450c Mon Sep 17 00:00:00 2001 From: Adam Saleh Date: Tue, 20 Oct 2020 10:01:25 +0200 Subject: [PATCH] So this didn't interpret the damned thing as string? Will it help if I change it to j2? Strong dislike for ansible and jinja intensifies. Convention over configuration my @687240 --- .../{dashboard_anitya.json => dashboard_anitya.json.j2} | 0 ...ard_monitor_gating.json => dashboard_monitor_gating.json.j2} | 0 ...board_package_tests.json => dashboard_package_tests.json.j2} | 0 .../monitor-dashboard/templates/deploymentconfig.yml | 2 ++ 4 files changed, 2 insertions(+) rename roles/openshift-apps/monitor-dashboard/templates/{dashboard_anitya.json => dashboard_anitya.json.j2} (100%) rename roles/openshift-apps/monitor-dashboard/templates/{dashboard_monitor_gating.json => dashboard_monitor_gating.json.j2} (100%) rename roles/openshift-apps/monitor-dashboard/templates/{dashboard_package_tests.json => dashboard_package_tests.json.j2} (100%) diff --git a/roles/openshift-apps/monitor-dashboard/templates/dashboard_anitya.json b/roles/openshift-apps/monitor-dashboard/templates/dashboard_anitya.json.j2 similarity index 100% rename from roles/openshift-apps/monitor-dashboard/templates/dashboard_anitya.json rename to roles/openshift-apps/monitor-dashboard/templates/dashboard_anitya.json.j2 diff --git a/roles/openshift-apps/monitor-dashboard/templates/dashboard_monitor_gating.json b/roles/openshift-apps/monitor-dashboard/templates/dashboard_monitor_gating.json.j2 similarity index 100% rename from roles/openshift-apps/monitor-dashboard/templates/dashboard_monitor_gating.json rename to roles/openshift-apps/monitor-dashboard/templates/dashboard_monitor_gating.json.j2 diff --git a/roles/openshift-apps/monitor-dashboard/templates/dashboard_package_tests.json b/roles/openshift-apps/monitor-dashboard/templates/dashboard_package_tests.json.j2 similarity index 100% rename from roles/openshift-apps/monitor-dashboard/templates/dashboard_package_tests.json rename to roles/openshift-apps/monitor-dashboard/templates/dashboard_package_tests.json.j2 diff --git a/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml b/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml index df075b4b12..0848b407fd 100644 --- a/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml +++ b/roles/openshift-apps/monitor-dashboard/templates/deploymentconfig.yml @@ -38,6 +38,8 @@ spec: value: 'false' - name: 'GF_USERS_AUTO_ASSIGN_ORG_ROLE' value: 'Admin' + - name: 'V' + value: 2 image: registry.hub.docker.com/grafana/grafana:latest name: dashboard ports: