aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorArnaud PARENT <arnaud@parent.mx>2019-04-30 11:31:50 +0000
committerArnaud PARENT <arnaud@parent.mx>2019-04-30 11:57:53 +0000
commita873677392f1736a73726d3f25a01c2f7cb1ade9 (patch)
tree4f0d65dc969126ac21f190359545c26bc865a0b7 /docker
parent9e9e31ed2c671d7547354708bb8decc05c737ecd (diff)
downloadkolla-a873677392f1736a73726d3f25a01c2f7cb1ade9.tar.gz
kolla-a873677392f1736a73726d3f25a01c2f7cb1ade9.zip
Add template override for grafana plugins
Change-Id: I209c3c60d5c2edb6856e81eb374fbcad648e3904 Closes-Bug: #1827025
Diffstat (limited to 'docker')
-rw-r--r--docker/grafana/Dockerfile.j29
1 files changed, 7 insertions, 2 deletions
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