diff --git a/docker/bifrost/bifrost-base/Dockerfile.j2 b/docker/bifrost/bifrost-base/Dockerfile.j2 index 2596842c73..154e443676 100644 --- a/docker/bifrost/bifrost-base/Dockerfile.j2 +++ b/docker/bifrost/bifrost-base/Dockerfile.j2 @@ -73,7 +73,6 @@ RUN echo " " && \ -e upper_constraints_file="/requirements/upper-constraints.txt" \ -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/docker/ironic-inspector/Dockerfile.j2 b/docker/ironic-inspector/Dockerfile.j2 deleted file mode 100644 index 29f0dbb679..0000000000 --- a/docker/ironic-inspector/Dockerfile.j2 +++ /dev/null @@ -1,46 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block ironic_inspector_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.configure_user(name='ironic-inspector') }} - -{% if base_package_type == 'rpm' %} - {% set ironic_inspector_packages = ['iptables'] %} -{% elif base_package_type == 'deb' %} - {% set ironic_inspector_packages = ['iptables'] %} -{% endif %} - -{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }} - -ADD ironic-inspector-archive /ironic-inspector-source -ADD ironic_inspector_sudoers /etc/sudoers.d/kolla_ironic_inspector_sudoers - -{% set ironic_inspector_pip_packages = [ - '/ironic-inspector' -] %} - -COPY extend_start.sh /usr/local/bin/kolla_extend_start - -RUN ln -s ironic-inspector-source/* ironic-inspector \ - && {{ macros.install_pip(ironic_inspector_pip_packages | customizable("pip_packages")) }} \ - && mkdir -p /etc/ironic-inspector \ - && cp /ironic-inspector/rootwrap.conf /etc/ironic-inspector/ \ - && cp -r /ironic-inspector/rootwrap.d/ /etc/ironic-inspector/ \ - && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ironic-inspector/rootwrap.conf \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_ironic_inspector_sudoers \ - && chmod 644 /usr/local/bin/kolla_extend_start \ - && mkdir -p /var/lib/ironic-inspector/dhcp-hostsdir \ - && chown -R ironic-inspector: /var/lib/ironic-inspector - -{{ macros.kolla_patch_sources() }} - -{% block ironic_inspector_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER ironic-inspector diff --git a/docker/ironic-inspector/extend_start.sh b/docker/ironic-inspector/extend_start.sh deleted file mode 100644 index 2582b017a3..0000000000 --- a/docker/ironic-inspector/extend_start.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -LOG_PATH=/var/log/kolla/ironic-inspector - -if [[ ! -d "${LOG_PATH}" ]]; then - mkdir -p "${LOG_PATH}" -fi -if [[ $(stat -c %a "${LOG_PATH}") != "755" ]]; then - chmod 755 "${LOG_PATH}" -fi - -# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases -# of the KOLLA_BOOTSTRAP variable being set, including empty. -if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade - exit 0 -fi diff --git a/docker/ironic-inspector/ironic_inspector_sudoers b/docker/ironic-inspector/ironic_inspector_sudoers deleted file mode 100644 index 3958468207..0000000000 --- a/docker/ironic-inspector/ironic_inspector_sudoers +++ /dev/null @@ -1 +0,0 @@ -ironic-inspector ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/ironic-inspector-rootwrap /etc/ironic-inspector/rootwrap.conf * diff --git a/kolla/common/sources.py b/kolla/common/sources.py index 9449c060f1..daf17ed38f 100644 --- a/kolla/common/sources.py +++ b/kolla/common/sources.py @@ -151,10 +151,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/ironic/' 'ironic-${openstack_branch}.tar.gz')}, - 'ironic-inspector': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/ironic-inspector/' - 'ironic-inspector-${openstack_branch}.tar.gz')}, 'ironic-conductor-plugin-prometheus-exporter': { 'type': 'url', 'location': ( diff --git a/kolla/common/users.py b/kolla/common/users.py index 9468396e42..95aefa4b6e 100644 --- a/kolla/common/users.py +++ b/kolla/common/users.py @@ -221,7 +221,7 @@ USERS = { 'uid': 42460, 'gid': 42460, }, - 'ironic-inspector-user': { + 'ironic-inspector-user': { # unused user (ironic-inspector dropped) 'uid': 42461, 'gid': 42461, }, diff --git a/releasenotes/notes/drop-ironic-inspector-093cc36e06787168.yaml b/releasenotes/notes/drop-ironic-inspector-093cc36e06787168.yaml new file mode 100644 index 0000000000..4aa76d6d86 --- /dev/null +++ b/releasenotes/notes/drop-ironic-inspector-093cc36e06787168.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + Removes support for building ``ironic-inspector`` images following + retirement in ``Ironic`` project. diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index 780ac07c8a..e8c6f7841f 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -26,7 +26,6 @@ kolla_build_sources: openstack/gnocchi: gnocchi-base openstack/heat: heat-base openstack/ironic: ironic-base - openstack/ironic-inspector: ironic-inspector openstack/keystone: keystone-base openstack/kuryr: kuryr-base openstack/kuryr-libnetwork: kuryr-libnetwork