diff options
| author | James Kirsch <generalfuzz@gmail.com> | 2020-07-23 18:55:33 -0700 |
|---|---|---|
| committer | James Kirsch <generalfuzz@gmail.com> | 2020-08-19 16:11:46 -0700 |
| commit | 9a02633fafc6ffad03c45c62f27bf8059fd430f4 (patch) | |
| tree | 8e594ede7fc73c051954760d7379b280c96bf612 | |
| parent | e43ec971bc7a4ae42ddeee43248254cf7c26d3f4 (diff) | |
| download | kolla-9a02633fafc6ffad03c45c62f27bf8059fd430f4.tar.gz kolla-9a02633fafc6ffad03c45c62f27bf8059fd430f4.zip | |
Enable mod_wsgi in Ironic API and Inspector container
This patch modifies the Dockerfile for both the Ironic API and
Inspector so that the 'root' user executes the container setup scripts.
This enables the container httpd configuration script to execute.
Change-Id: I02b58ac571cd4eb3b9d4a814fe0cb907a3564e23
| -rw-r--r-- | docker/ironic-inspector/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ironic-inspector/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/ironic/ironic-api/Dockerfile.j2 | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/docker/ironic-inspector/Dockerfile.j2 b/docker/ironic-inspector/Dockerfile.j2 index 5d08f3b9f..34307b889 100644 --- a/docker/ironic-inspector/Dockerfile.j2 +++ b/docker/ironic-inspector/Dockerfile.j2 @@ -58,5 +58,3 @@ 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 2582b017a..93b8bf025 100644 --- a/docker/ironic-inspector/extend_start.sh +++ b/docker/ironic-inspector/extend_start.sh @@ -15,3 +15,5 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then ironic-inspector-dbsync --config-file /etc/ironic-inspector/inspector.conf upgrade exit 0 fi + +. /usr/local/bin/kolla_httpd_setup diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 799a0c2d7..d90992ee0 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -30,5 +30,3 @@ RUN chmod 755 /usr/local/bin/kolla_ironic_extend_start {% block ironic_api_footer %}{% endblock %} {% block footer %}{% endblock %} - -USER ironic |