diff --git a/etc/kayobe/kolla-image-tags.yml b/etc/kayobe/kolla-image-tags.yml index 2a87d2d5cc..ecd4f9a48d 100644 --- a/etc/kayobe/kolla-image-tags.yml +++ b/etc/kayobe/kolla-image-tags.yml @@ -6,6 +6,9 @@ kolla_image_tags: openstack: rocky-9: 2025.1-rocky-9-20250730T105631 ubuntu-noble: 2025.1-ubuntu-noble-20250730T105631 + grafana: + rocky-9: 2025.1-rocky-9-20250916T101619 + ubuntu-noble: 2025.1-ubuntu-noble-20250916T101619 keystone: rocky-9: 2025.1-rocky-9-20250805T134044 ubuntu-noble: 2025.1-ubuntu-noble-20250805T134044 diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 6892d9e999..40e7343595 100644 --- a/etc/kayobe/kolla.yml +++ b/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,8 @@ kolla_build_blocks: kolla_build_customizations_common: bifrost_base_pip_packages_append: - /additions/* + grafana_plugins_append: + - vonage-status-panel ironic_inspector_pip_packages_append: - /additions/* magnum_base_pip_packages_override: diff --git a/releasenotes/notes/grafana-plugin-install-logic-d935846abf0d27d0.yaml b/releasenotes/notes/grafana-plugin-install-logic-d935846abf0d27d0.yaml new file mode 100644 index 0000000000..db2e8279a6 --- /dev/null +++ b/releasenotes/notes/grafana-plugin-install-logic-d935846abf0d27d0.yaml @@ -0,0 +1,8 @@ +--- +features: + - | + New logic for installing grafana plugins. When building you can pass a + variable ``grafana_plugins_append`` that contains a list of plugins you + want to install. This will be appended to the default list of plugins. The + existing method of overwriting the ``grafana_plugins_install`` block still + works.