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]>

Author: 2 people

etc/kayobe/kolla.yml

@@ -349,9 +349,6 @@ kolla_build_blocks:
   bifrost_base_header: |
     ADD additions-archive /
     ENV TOX_CONSTRAINTS_FILE=/requirements/upper-constraints.txt
-  grafana_plugins_install: |
-    RUN grafana-cli plugins install vonage-status-panel \
-        && grafana-cli plugins install grafana-opensearch-datasource
   ironic_inspector_header: |
     ADD additions-archive /
 
@@ -364,6 +361,9 @@ kolla_build_blocks:
 kolla_build_customizations_common:
   bifrost_base_pip_packages_append:
     - /additions/*
+  grafana_plugins_append:
+    - grafana-piechart-panel
+    - vonage-status-panel
   ironic_inspector_pip_packages_append:
     - /additions/*
   magnum_base_pip_packages_override: