Use ironic-inspector user for ironic-inspector

This change updates the ironic-inspector image to use the
ironic-inspector user rather than the ironic user to execute the
ironic inspector service as this more closely aligns with what is
typically done by downstream packagers (specifically, Ubuntu and
RDO).

This change rebases the ironic-inspector image onto the openstack-base
image instead of the ironic-base image. We configure an
ironic-inspector user and use this to execute the ironic-inspector
service. We also configure ironic-inspector to log to
/var/log/kolla/ironic-inspector instead of the previous ironic
location.

Following this change we no longer need the workaround of a
sudoers file for the binary install type that was added in change
I8ecd0b658b8df8f38ddf717fa9443d4dc2896984.

Change-Id: Ibdc5ba35db61f4974d4282aff34bcb5ccd952d45
Closes-Bug: #1624457

4 files changed, 0 insertions, 65 deletions

diff --git a/docker/ironic/ironic-inspector/Dockerfile.j2 b/docker/ironic/ironic-inspector/Dockerfile.j2
deleted file mode 100644
index 8c3cd5a9d..000000000
--- a/docker/ironic/ironic-inspector/Dockerfile.j2
+++ /dev/null
@@ -1,55 +0,0 @@
-FROM {{ namespace }}/{{ image_prefix }}ironic-base:{{ tag }}
-MAINTAINER {{ maintainer }}
-
-{% block ironic_inspector_header %}{% endblock %}
-
-{% import "macros.j2" as macros with context %}
-
-{% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
-        {% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
-        {% set ironic_inspector_packages = [
-            'iptables',
-            'ironic-inspector'
-        ] %}
-    {% endif %}
-
-{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
-
-COPY ironic_sudoers_binary /etc/sudoers.d/kolla_ironic_inspector_sudoers
-
-{% elif install_type == 'source' %}
-    {% if base_distro in ['debian', 'ubuntu'] %}
-        {% set ironic_inspector_packages = ['iptables'] %}
-    {% endif %}
-
-{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
-
-ADD ironic-inspector-archive /ironic-inspector-source
-
-{% set ironic_inspector_pip_packages = [
-    '/ironic-inspector'
-] %}
-
-RUN ln -s ironic-inspector-source/* ironic-inspector \
-    && mv /etc/ironic /etc/ironic-inspector \
-    && {{ macros.install_pip(ironic_inspector_pip_packages | customizable("pip_packages")) }} \
-    && 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
-
-COPY ironic_sudoers_source /etc/sudoers.d/kolla_ironic_inspector_sudoers
-
-{% endif %}
-
-COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start
-
-RUN chmod 750 /etc/sudoers.d \
-    && chmod 440 /etc/sudoers.d/kolla_ironic_inspector_sudoers \
-    && chmod 755 /usr/local/bin/kolla_ironic_extend_start
-
-{% block ironic_inspector_footer %}{% endblock %}
-{% block footer %}{% endblock %}
-
-USER ironic
diff --git a/docker/ironic/ironic-inspector/extend_start.sh b/docker/ironic/ironic-inspector/extend_start.sh
deleted file mode 100644
index b87060adb..000000000
--- a/docker/ironic/ironic-inspector/extend_start.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-# 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/ironic-inspector/ironic_sudoers_binary b/docker/ironic/ironic-inspector/ironic_sudoers_binary
deleted file mode 100644
index d1e0ef68d..000000000
--- a/docker/ironic/ironic-inspector/ironic_sudoers_binary
+++ /dev/null
@@ -1 +0,0 @@
-ironic ALL=(root) NOPASSWD: /usr/bin/ironic-inspector-rootwrap /etc/ironic-inspector/rootwrap.conf *
diff --git a/docker/ironic/ironic-inspector/ironic_sudoers_source b/docker/ironic/ironic-inspector/ironic_sudoers_source
deleted file mode 100644
index 612f8dc3a..000000000
--- a/docker/ironic/ironic-inspector/ironic_sudoers_source
+++ /dev/null
@@ -1 +0,0 @@
-ironic ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/ironic-inspector-rootwrap /etc/ironic-inspector/rootwrap.conf *