From a873677392f1736a73726d3f25a01c2f7cb1ade9 Mon Sep 17 00:00:00 2001 From: Arnaud PARENT Date: Tue, 30 Apr 2019 11:31:50 +0000 Subject: Add template override for grafana plugins Change-Id: I209c3c60d5c2edb6856e81eb374fbcad648e3904 Closes-Bug: #1827025 --- docker/grafana/Dockerfile.j2 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index a608ae151..a978e92e5 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -40,9 +40,14 @@ WORKDIR /usr/share/grafana COPY grafana_sudoers /etc/sudoers.d/kolla_grafana_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start +{% block grafana_plugins_install %} + RUN grafana-cli plugins install gnocchixyz-gnocchi-datasource \ - && grafana-cli plugins install grafana-influxdb-08-datasource \ - && chmod 750 /etc/sudoers.d \ + && grafana-cli plugins install grafana-influxdb-08-datasource + +{% endblock %} + +RUN chmod 750 /etc/sudoers.d \ && chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \ && chmod 755 /usr/local/bin/kolla_extend_start -- cgit v1.2.3