Skip to content

Commit 70e51fe

Browse files
technowhizzjovial
authored andcommitted
Change grafana plugin install logic
Changing the way in which we specify grafana plugins to install. This is due to a change upstream which now allows plugins to be installed in an additive method instead of replacing the upstream default plugins [1]. [1] https://review.opendev.org/c/openstack/kolla/+/913184 Co-authored-by: Will Szumski <will@stackhpc.com>
1 parent c646872 commit 70e51fe

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

etc/kayobe/kolla.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -358,9 +358,6 @@ kolla_build_blocks:
358358
bifrost_base_header: |
359359
ADD additions-archive /
360360
ENV TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt
361-
grafana_plugins_install: |
362-
RUN grafana-cli plugins install vonage-status-panel \
363-
&& grafana-cli plugins install grafana-opensearch-datasource
364361
ironic_inspector_header: |
365362
ADD additions-archive /
366363
@@ -373,6 +370,8 @@ kolla_build_blocks:
373370
kolla_build_customizations_common:
374371
bifrost_base_pip_packages_append:
375372
- /additions/*
373+
grafana_plugins_append:
374+
- vonage-status-panel
376375
ironic_inspector_pip_packages_append:
377376
- /additions/*
378377
magnum_base_pip_packages_override:
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
features:
3+
- |
4+
New logic for installing grafana plugins. When building you can pass a
5+
variable ``grafana_plugins_append`` that contains a list of plugins you
6+
want to install. This will be appended to the default list of plugins. The
7+
existing method of overwriting the ``grafana_plugins_install`` block still
8+
works.

0 commit comments

Comments
 (0)