aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgeneralfuzz <generalfuzz@gmail.com>2020-09-25 09:37:48 -0700
committergeneralfuzz <generalfuzz@gmail.com>2020-09-25 09:37:48 -0700
commit998067b8494c708c7993006c0421fc9b6d2a466a (patch)
tree0b9f2a7aa5031e1725dba3c5fb71a096856739eb
parentf441c8ea5bf4ae24a71a351b663635abc4889d0e (diff)
downloadkolla-998067b8494c708c7993006c0421fc9b6d2a466a.tar.gz
kolla-998067b8494c708c7993006c0421fc9b6d2a466a.zip
Run Ironic Inspector as ironic-inspector user
This patch reverts changes to the Dockerfile and configuration script that were made to support running the service using wsgi. Ironic Inspector does not currently support running with wsgi. Change-Id: Idc816f25c85ef7d5cd14182fe01b652876cb181a
-rw-r--r--docker/ironic-inspector/Dockerfile.j22
-rw-r--r--docker/ironic-inspector/extend_start.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/ironic-inspector/Dockerfile.j2 b/docker/ironic-inspector/Dockerfile.j2
index 34307b889..5d08f3b9f 100644
--- a/docker/ironic-inspector/Dockerfile.j2
+++ b/docker/ironic-inspector/Dockerfile.j2
@@ -58,3 +58,5 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
{% 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
index 93b8bf025..2582b017a 100644
--- a/docker/ironic-inspector/extend_start.sh
+++ b/docker/ironic-inspector/extend_start.sh
@@ -15,5 +15,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade
exit 0
fi
-
-. /usr/local/bin/kolla_httpd_setup