From b5347fc76dcf10b2a12732e9d08041cc677d7fe2 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 25 Aug 2022 10:17:34 +0100
Subject: [PATCH 1/2] bifrost: Add stackhpc-inspector-plugins to image

---
 etc/kayobe/kolla.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml
index 2382158e4..2f19fb75d 100644
--- a/etc/kayobe/kolla.yml
+++ b/etc/kayobe/kolla.yml
@@ -114,6 +114,11 @@ kolla_sources:
     type: git
     location: "{{ kolla_bifrost_source_url }}"
     reference: "{{ kolla_bifrost_source_version }}"
+  bifrost-base-additions-stackhpc-inspector-plugins:
+    # Install our custom inspector plugins.
+    type: git
+    location: https://github.com/stackhpc/stackhpc-inspector-plugins.git
+    reference: 1.3.0
   cloudkitty-base:
     type: git
     location: https://github.com/stackhpc/cloudkitty.git
@@ -221,6 +226,8 @@ kolla_build_blocks:
   #       echo '{{ repo }}' >> /etc/apt/sources.list {% if not loop.last %} && \
   #   {% endif %}
   #   {% endfor %}
+  bifrost_base_header: |
+    ADD additions-archive /
   grafana_plugins_install: |
     RUN grafana-cli plugins install vonage-status-panel
   ironic_inspector_header: |
@@ -244,6 +251,8 @@ kolla_build_blocks:
     ARG blackbox_exporter_version='0.19.0'
 
 kolla_build_customizations_common:
+  bifrost_base_pip_packages_append:
+    - /additions/*
   ironic_inspector_pip_packages_append:
     - /additions/*
 

From f02e3bf8dd0bd79da2a6f69970cea1fa81c72bc8 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Thu, 25 Aug 2022 12:39:19 +0100
Subject: [PATCH 2/2] bifrost: update tags

Includes stackhpc-inspector-plugins package.
---
 etc/kayobe/kolla/globals.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml
index db0992bf3..68c3951f7 100644
--- a/etc/kayobe/kolla/globals.yml
+++ b/etc/kayobe/kolla/globals.yml
@@ -5,6 +5,7 @@ docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.
 
 {% if kolla_base_distro == 'centos' %}
 barbican_tag: wallaby-20220311T133847
+bifrost_tag: wallaby-20220825T103439
 cinder_tag: wallaby-20220309T083940
 cloudkitty_tag: wallaby-20220119T122428
 grafana_tag: wallaby-20220210T160332
@@ -27,5 +28,5 @@ prometheus_openstack_exporter_tag: wallaby-20220705T132206
 skydive_agent_tag: wallaby-20220817T151053
 skydive_analyzer_tag: wallaby-20220817T151053
 {% else %}
-bifrost_tag: wallaby-20220819T150635
+bifrost_tag: wallaby-20220825T112231
 {% endif %}