diff options
| author | Zuul <zuul@review.opendev.org> | 2024-06-28 18:23:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-06-28 18:23:49 +0000 |
| commit | 603f58cac55dd3081bcb5b7104e902f216089646 (patch) | |
| tree | e6004eda598e391ff05ddaba0d76f0351cc6cec6 /docker | |
| parent | 7aec3724809681a2cf68c0686b6b8e2d83dcd02f (diff) | |
| parent | 077e0003d41746a0052564ee1487d981f125cec9 (diff) | |
| download | kolla-603f58cac55dd3081bcb5b7104e902f216089646.tar.gz kolla-603f58cac55dd3081bcb5b7104e902f216089646.zip | |
Merge "Change logic for plugins in grafana image build"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/grafana/Dockerfile.j2 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2 index cd4e94540..a769945e4 100644 --- a/docker/grafana/Dockerfile.j2 +++ b/docker/grafana/Dockerfile.j2 @@ -22,9 +22,12 @@ 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-opensearch-datasource +{% set grafana_default_plugins = ['gnocchixyz-gnocchi-datasource', 'grafana-opensearch-datasource'] %} +{% set grafana_plugins = grafana_default_plugins | customizable("plugins") %} +{% if grafana_plugins | length > 0 %} +RUN {{ (['grafana-cli plugins install %s'] * grafana_plugins | length ) | join(' && ') | format(*grafana_plugins) }} +{% endif %} {% endblock %} RUN chmod 750 /etc/sudoers.d \ |