aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2026-09-18 13:47:42 +0000
committerGerrit Code Review <review@openstack.org>2026-09-18 13:47:42 +0000
commitcd36091e3b20a33df27cae4130085b75c3f9dcab (patch)
tree79976000d6b7bf1998b1e0b922079ab42f522c9c
parentcb0724a9efb084651ff3c3b1cd012803e833afd8 (diff)
parentee8b2a2095389567ea393f1b364cad02ec78b766 (diff)
downloadkolla-cd36091e3b20a33df27cae4130085b75c3f9dcab.tar.gz
kolla-cd36091e3b20a33df27cae4130085b75c3f9dcab.zip
Merge "grafana: replace deprecated grafana-cli"
-rw-r--r--kolla/docker/grafana/Dockerfile.j22
-rw-r--r--releasenotes/notes/bug-2166075-ea3b86dd40834b08.yaml5
2 files changed, 6 insertions, 1 deletions
diff --git a/kolla/docker/grafana/Dockerfile.j2 b/kolla/docker/grafana/Dockerfile.j2
index daaca1361..a3a2210e5 100644
--- a/kolla/docker/grafana/Dockerfile.j2
+++ b/kolla/docker/grafana/Dockerfile.j2
@@ -31,7 +31,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
{% 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) }}
+RUN {{ (['grafana cli plugins install %s'] * grafana_plugins | length ) | join(' && ') | format(*grafana_plugins) }}
{% endif %}
{% endblock %}
diff --git a/releasenotes/notes/bug-2166075-ea3b86dd40834b08.yaml b/releasenotes/notes/bug-2166075-ea3b86dd40834b08.yaml
new file mode 100644
index 000000000..62dda913c
--- /dev/null
+++ b/releasenotes/notes/bug-2166075-ea3b86dd40834b08.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Replace deprecated ``grafana-cli`` with ``grafana cli``.
+ `LP#2166075 <https://launchpad.net/bugs/2166075>`__