c7482778aa
This patch modifies the Dockerfile for the Nova API so that the 'root' user executes the container setup scripts. This enables the container httpd configuration script to execute. Change-Id: I374af00a374346840c12777a530d39768b28c908 Partially-Implements: blueprint add-ssl-internal-network Depends-On: https://review.opendev.org/725962
70 lines
1.9 KiB
Django/Jinja
70 lines
1.9 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }}
|
|
{% block labels %}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
{% endblock %}
|
|
|
|
{% block nova_api_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_package_type == 'rpm' %}
|
|
|
|
{% set nova_api_packages = [
|
|
'httpd',
|
|
'mod_ssl',
|
|
'openstack-nova-api',
|
|
'python3-mod_wsgi',
|
|
] %}
|
|
|
|
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
|
|
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_package_type == 'deb' %}
|
|
|
|
{% set nova_api_packages = [
|
|
'apache2',
|
|
'libapache2-mod-wsgi-py3',
|
|
'nova-api',
|
|
'python3-memcache'
|
|
] %}
|
|
|
|
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
|
|
RUN echo > /etc/apache2/ports.conf
|
|
{% endif %}
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
|
|
{% set nova_api_packages = [
|
|
'httpd',
|
|
'mod_ssl',
|
|
'python3-mod_wsgi',
|
|
] %}
|
|
|
|
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
|
|
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_package_type == 'deb' %}
|
|
|
|
{% set nova_api_packages = [
|
|
'apache2',
|
|
'libapache2-mod-wsgi-py3'
|
|
] %}
|
|
|
|
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
|
|
RUN echo > /etc/apache2/ports.conf
|
|
|
|
{% endif %}
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_nova_extend_start
|
|
|
|
{% block nova_api_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|