f5d31da12f
In Train kolla switched to Python 3 in Debian and Ubuntu source images. For services running under httpd with mod_wsgi, they should install libapache2-mod-wsgi-py3 rather than libapache2-mod-wsgi. This was done for most images, but cyborg and monasca were omitted. This change fixes that. Change-Id: I25cfa62dbf20490685617b4a4185bf95ab91725e Closes-Bug: #1873421
61 lines
1.7 KiB
Django/Jinja
61 lines
1.7 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
{% block labels %}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
{% endblock %}
|
|
|
|
{% block monasca_base_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{{ macros.configure_user(name='monasca') }}
|
|
|
|
{% if install_type == 'binary' %}
|
|
|
|
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
|
|
&& /bin/false
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set monasca_base_packages = [
|
|
'httpd',
|
|
'mod_ssl',
|
|
'python3-mod_wsgi',
|
|
] %}
|
|
|
|
{{ macros.install_packages(monasca_base_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 monasca_base_packages = [
|
|
'apache2',
|
|
'libapache2-mod-wsgi-py3',
|
|
'librdkafka-dev'
|
|
] %}
|
|
|
|
{{ macros.install_packages(monasca_base_packages | customizable("packages")) }}
|
|
RUN truncate -s 0 /etc/apache2/ports.conf
|
|
|
|
{% endif %}
|
|
|
|
{% block monasca_source_install %}
|
|
|
|
{% set monasca_base_pip_packages = [
|
|
'monasca-common',
|
|
] %}
|
|
|
|
RUN {{ macros.install_pip(monasca_base_pip_packages | customizable("pip_packages")) }} \
|
|
&& mkdir -p /etc/monasca \
|
|
&& chown -R monasca: /etc/monasca
|
|
{% endblock %}
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
|
|
RUN touch /usr/local/bin/kolla_monasca_extend_start \
|
|
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_monasca_extend_start
|
|
|
|
{% block monasca_base_footer %}{% endblock %}
|