diff options
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-api/Dockerfile.j2 | 36 | ||||
| -rw-r--r-- | docker/ironic/ironic-api/extend_start.sh | 13 |
2 files changed, 47 insertions, 2 deletions
diff --git a/docker/ironic/ironic-api/Dockerfile.j2 b/docker/ironic/ironic-api/Dockerfile.j2 index 33738e2b2..3aa5a0a4a 100644 --- a/docker/ironic/ironic-api/Dockerfile.j2 +++ b/docker/ironic/ironic-api/Dockerfile.j2 @@ -7,13 +7,45 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set ironic_api_packages = ['openstack-ironic-api'] %} + {% set ironic_api_packages = [ + 'httpd', + 'mod_ssl', + 'mod_wsgi', + 'openstack-ironic-api' + ] %} {% elif base_distro in ['debian', 'ubuntu'] %} - {% set ironic_api_packages = ['ironic-api'] %} + {% set ironic_api_packages = [ + 'apache2', + 'ironic-api', + 'libapache2-mod-wsgi' + ] %} {% endif %} +{% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set ironic_api_packages = [ + 'httpd', + 'mod_ssl', + 'mod_wsgi' + ] %} + {% elif base_distro in ['debian', 'ubuntu'] %} + {% set ironic_api_packages = [ + 'apache2', + 'libapache2-mod-wsgi' + ] %} + {% endif %} + +{% endif %} + {{ macros.install_packages(ironic_api_packages | customizable("packages")) }} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} +RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ + && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf + +{% elif base_distro in ['debian', 'ubuntu'] %} +RUN echo > /etc/apache2/ports.conf + {% endif %} COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start diff --git a/docker/ironic/ironic-api/extend_start.sh b/docker/ironic/ironic-api/extend_start.sh index cd9c95a12..7ac9f9020 100644 --- a/docker/ironic/ironic-api/extend_start.sh +++ b/docker/ironic/ironic-api/extend_start.sh @@ -6,3 +6,16 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then ironic-dbsync upgrade exit 0 fi + +# Assume the service runs on top of Apache when user is root +if [[ "$(whoami)" == 'root' ]]; then + # NOTE(pbourke): httpd will not clean up after itself in some cases which + # results in the container not being able to restart. (bug #1489676, 1557036) + if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then + # Loading Apache2 ENV variables + . /etc/apache2/envvars + rm -rf /var/run/apache2/* + else + rm -rf /var/run/httpd/* /run/httpd/* /tmp/httpd* + fi +fi |