5b281d8482
This patch adds packages to the octavia-api container to support running
it under apache instead of under simple server. This resolves an issue
with haproxy as well as support IPv6.
Change-Id: I72e0a44f081747ebaec25fd5049db83ea6f418ff
Related-Bug: #1815811
(cherry picked from commit 2c75a2429b)
54 lines
1.6 KiB
Django/Jinja
54 lines
1.6 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}octavia-base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block octavia_api_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
|
|
{% set octavia_api_packages = [
|
|
'openstack-octavia-api',
|
|
'httpd',
|
|
'mod_ssl',
|
|
'mod_wsgi'
|
|
] %}
|
|
{% elif base_distro in ['debian', 'ubuntu'] %}
|
|
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
|
&& /bin/false
|
|
{% endif %}
|
|
|
|
|
|
{% elif install_type == 'source' %}
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set octavia_api_packages = [
|
|
'httpd',
|
|
'mod_ssl',
|
|
'mod_wsgi'
|
|
] %}
|
|
{% elif base_package_type == 'deb' %}
|
|
{% set octavia_api_packages = [
|
|
'apache2',
|
|
'libapache2-mod-wsgi'
|
|
] %}
|
|
{% endif %}
|
|
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(octavia_api_packages | customizable("packages")) }}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
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' %}
|
|
RUN echo > /etc/apache2/ports.conf
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_octavia_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_octavia_extend_start
|
|
|
|
{% block octavia_api_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|
|
|
|
USER octavia
|