openstack/kolla
Code Issues Proposed changes

Merge "Add template override for grafana plugins"

Browse Source
This commit is contained in:
Zuul 2019-05-07 19:28:48 +00:00 committed by Gerrit Code Review
commit e15a344933
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/grafana/Dockerfile.j2
View File

@ -40,9 +40,14 @@ WORKDIR /usr/share/grafana
COPY grafana_sudoers /etc/sudoers.d/kolla_grafana_sudoers COPY grafana_sudoers /etc/sudoers.d/kolla_grafana_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
{% block grafana_plugins_install %}
RUN grafana-cli plugins install gnocchixyz-gnocchi-datasource \ RUN grafana-cli plugins install gnocchixyz-gnocchi-datasource \
&& grafana-cli plugins install grafana-influxdb-08-datasource \ && grafana-cli plugins install grafana-influxdb-08-datasource
&& chmod 750 /etc/sudoers.d \
{% endblock %}
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \ && chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \
&& chmod 755 /usr/local/bin/kolla_extend_start && chmod 755 /usr/local/bin/kolla_extend_start