Skip to content

Commit fefcd98

Browse files
mnasiadkaAlex-Welsh
authored andcommitted
Drop ironic-inspector
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/951864 Change-Id: Ie7e607c5a9c6f8c2e36aea5d52dc2ffbe97dddb3 Signed-off-by: Michal Nasiadka <[email protected]>
1 parent 30ae275 commit fefcd98

File tree

8 files changed

+6
-71
lines changed

8 files changed

+6
-71
lines changed

docker/bifrost/bifrost-base/Dockerfile.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ RUN echo " " && \
7373
-e upper_constraints_file="/requirements/upper-constraints.txt" \
7474
-e git_branch={{ openstack_branch_slashed }} \
7575
-e ipa_upstream_release={{ openstack_branch }} \
76-
-e enable_inspector=true \
7776
-e @/tmp/build_arg.yml && \
7877
{%- if base_package_type == 'deb' %}
7978
apt-get clean && rm -rf /var/lib/apt/lists/*'

docker/ironic-inspector/Dockerfile.j2

Lines changed: 0 additions & 46 deletions
This file was deleted.

docker/ironic-inspector/extend_start.sh

Lines changed: 0 additions & 17 deletions
This file was deleted.

docker/ironic-inspector/ironic_inspector_sudoers

Lines changed: 0 additions & 1 deletion
This file was deleted.

kolla/common/sources.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,6 @@
151151
'type': 'url',
152152
'location': ('$tarballs_base/openstack/ironic/'
153153
'ironic-${openstack_branch}.tar.gz')},
154-
'ironic-inspector': {
155-
'type': 'url',
156-
'location': ('$tarballs_base/openstack/ironic-inspector/'
157-
'ironic-inspector-${openstack_branch}.tar.gz')},
158154
'ironic-conductor-plugin-prometheus-exporter': {
159155
'type': 'url',
160156
'location': (

kolla/common/users.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@
221221
'uid': 42460,
222222
'gid': 42460,
223223
},
224-
'ironic-inspector-user': {
224+
'ironic-inspector-user': { # unused user (ironic-inspector dropped)
225225
'uid': 42461,
226226
'gid': 42461,
227227
},
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
upgrade:
3+
- |
4+
Removes support for building ``ironic-inspector`` images following
5+
retirement in ``Ironic`` project.

roles/kolla-build-config/defaults/main.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ kolla_build_sources:
2626
openstack/gnocchi: gnocchi-base
2727
openstack/heat: heat-base
2828
openstack/ironic: ironic-base
29-
openstack/ironic-inspector: ironic-inspector
3029
openstack/keystone: keystone-base
3130
openstack/kuryr: kuryr-base
3231
openstack/kuryr-libnetwork: kuryr-libnetwork

0 commit comments

Comments
 (0)