From: fmount Date: Fri, 12 Jul 2019 09:03:57 +0000 (+0200) Subject: Avoid to setup provisioners in a fully containerized environment X-Git-Tag: v5.0.0alpha1~203 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fac1b030cbc67abfe1af83ec1ffdb648db4bda70;p=ceph-ansible.git 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 --- 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: