aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2024-02-26 11:54:00 +0000
committerGerrit Code Review <review@openstack.org>2024-02-26 11:54:00 +0000
commit5448da7e362a3e049d11b067df68b432605bdaf8 (patch)
treed182f716b89f3b99d93593bbacc49b7a56a67f5c
parent0246b32d70da39f6e837974f339e845f0c8b9e8f (diff)
parent832a6381c314c947abbb6409122ddc8aa044e7f9 (diff)
downloadkolla-5448da7e362a3e049d11b067df68b432605bdaf8.tar.gz
kolla-5448da7e362a3e049d11b067df68b432605bdaf8.zip
Merge "Install ironic-inspector in bifrost"
-rw-r--r--docker/bifrost/bifrost-base/Dockerfile.j21
-rw-r--r--releasenotes/notes/reenable-ironic-inspector-in-bifrost.yml-5e01af1e96528c62.yaml6
2 files changed, 7 insertions, 0 deletions
diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2
index b44668726..bfe31dbbf 100644
--- a/docker/bifrost/bifrost-base/Dockerfile.j2
+++ b/docker/bifrost/bifrost-base/Dockerfile.j2
@@ -47,6 +47,7 @@ RUN echo " " && \
/bifrost/playbooks/install.yaml \
-e git_branch={{ openstack_branch_slashed }} \
-e ipa_upstream_release={{ openstack_branch }} \
+ -e enable_inspector=true \
-e @/tmp/build_arg.yml && \
{%- if base_package_type == 'deb' %}
apt-get clean && rm -rf /var/lib/apt/lists/*'
diff --git a/releasenotes/notes/reenable-ironic-inspector-in-bifrost.yml-5e01af1e96528c62.yaml b/releasenotes/notes/reenable-ironic-inspector-in-bifrost.yml-5e01af1e96528c62.yaml
new file mode 100644
index 000000000..7dcf4fb51
--- /dev/null
+++ b/releasenotes/notes/reenable-ironic-inspector-in-bifrost.yml-5e01af1e96528c62.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+ - |
+ Re-enables ironic-inspector in bifrost for backwards compatability. See
+ `LP#2054685 <https://bugs.launchpad.net/kolla/+bug/2054685>`_ for more
+ details.