]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Avoid to setup provisioners in a fully containerized environment
authorfmount <fpantano@redhat.com>
Fri, 12 Jul 2019 09:03:57 +0000 (11:03 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Tue, 23 Jul 2019 07:06:50 +0000 (09:06 +0200)
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 <fpantano@redhat.com>
roles/ceph-grafana/tasks/configure_grafana.yml

index ab5b831cefea0db2e991d10bae41ef9fcc503546..7d542d4ab3897083121cebcb461b5949ab4cae66 100644 (file)
@@ -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: