diff options
| author | Zuul <zuul@review.opendev.org> | 2019-05-07 19:28:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-05-07 19:28:48 +0000 |
| commit | e15a34493360ed0d871528c66801186c2647002a (patch) | |
| tree | b3a36c4c834c83580ec2b420dca5ca9ace4bc1dd | |
| parent | c8375058eff8fd88d43030522453b25fdf98dc2a (diff) | |
| parent | a873677392f1736a73726d3f25a01c2f7cb1ade9 (diff) | |
| download | kolla-e15a34493360ed0d871528c66801186c2647002a.tar.gz kolla-e15a34493360ed0d871528c66801186c2647002a.zip | |
Merge "Add template override for grafana plugins"
| -rw-r--r-- | docker/grafana/Dockerfile.j2 | 9 |
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 |