Skip to content

Commit befbabc

Browse files
technowhizzjovial
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 <[email protected]>
1 parent c5d33b3 commit befbabc

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

etc/kayobe/kolla.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,11 +337,6 @@ kolla_build_blocks:
337337
bifrost_base_header: |
338338
ADD additions-archive /
339339
ENV TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt
340-
grafana_plugins_install: |
341-
RUN grafana-cli plugins install vonage-status-panel \
342-
&& grafana-cli plugins install grafana-piechart-panel \
343-
&& grafana-cli plugins install grafana-opensearch-datasource \
344-
&& grafana-cli plugins install gnocchixyz-gnocchi-datasource
345340
ironic_inspector_header: |
346341
ADD additions-archive /
347342
magnum_base_footer: |
@@ -360,6 +355,9 @@ kolla_build_blocks:
360355
kolla_build_customizations_common:
361356
bifrost_base_pip_packages_append:
362357
- /additions/*
358+
grafana_plugins_append:
359+
- grafana-piechart-panel
360+
- vonage-status-panel
363361
ironic_inspector_pip_packages_append:
364362
- /additions/*
365363
neutron_server_packages_append:

0 commit comments

Comments
 (0)