diff options
| author | Zuul <zuul@review.opendev.org> | 2020-09-08 08:50:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-09-08 08:50:48 +0000 |
| commit | a1cef38799596619aed315ae7093c32699696e57 (patch) | |
| tree | 11c6d38d1a8e7e03a6e9af97aecc8b4a2cfbb335 | |
| parent | d09652c7d802e3817f8f740441f18fa3fbf4954d (diff) | |
| parent | 9a02633fafc6ffad03c45c62f27bf8059fd430f4 (diff) | |
| download | kolla-a1cef38799596619aed315ae7093c32699696e57.tar.gz kolla-a1cef38799596619aed315ae7093c32699696e57.zip | |
Merge "Enable mod_wsgi in Ironic API and Inspector container"
| -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 |