From 15c745d998cc0a3bb8cac6908131aa7671e476b7 Mon Sep 17 00:00:00 2001 From: fmount Date: Fri, 12 Jul 2019 11:03:57 +0200 Subject: [PATCH] Avoid to setup provisioners in a fully containerized environment This commit adds a when clause to avoid the setup of grafana provisioners in a fully containerized scenario. This is needed when the ceph-grafana-dashboards package is not installed and this task could result in a wrong grafana configuration that let the container crash. Signed-off-by: fmount (cherry picked from commit fac1b030cbc67abfe1af83ec1ffdb648db4bda70) --- roles/ceph-grafana/tasks/configure_grafana.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/ceph-grafana/tasks/configure_grafana.yml b/roles/ceph-grafana/tasks/configure_grafana.yml index ab5b831ce..7d542d4ab 100644 --- a/roles/ceph-grafana/tasks/configure_grafana.yml +++ b/roles/ceph-grafana/tasks/configure_grafana.yml @@ -28,6 +28,7 @@ with_items: - "/etc/grafana/provisioning/datasources" - "/etc/grafana/provisioning/dashboards" + - "/etc/grafana/provisioning/notifiers" - name: write grafana.ini template: @@ -46,6 +47,7 @@ src: dashboards-ceph-dashboard.yml.j2 dest: /etc/grafana/provisioning/dashboards/ceph-dashboard.yml mode: 0640 + when: not containerized_deployment | bool - name: copy grafana SSL certificate file copy: -- 2.39.5