d436001b43
Commit 43b74ccc15 enabled use of Python 3
based packages but not switched to use Python 3.
Some of images still contain Python 2. There are two reasons:
- Ceph (ceph-common depends on Py2)
- python3-ldappool on Ubuntu 18.04
In Ceph situation Py3 packages were added. For second one we can not do
anything - Py2 dependency got dropped in Ubuntu 18.10 version.
Removed neutron-server-plugin-networking-infoblox due to being not
maintained. Once https://review.opendev.org/#/c/657578/ get merged
someone may revert that part.
Implements: blueprint debian-ubuntu-python3
Depends-on: Ie2a1077f7def0743f1403341985e2109aa490026
Change-Id: Ibfe0c2b8be98db56c61f74fb0247488ab3749ef4
115 lines
3.7 KiB
Django/Jinja
115 lines
3.7 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block aodh_base_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{{ macros.configure_user(name='aodh') }}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_package_type == 'rpm' %}
|
|
|
|
{# NOTE(aschultz): added api because the common package doesn't include the wsgi file. I think this needs fixing #}
|
|
{% set aodh_base_packages = [
|
|
'httpd',
|
|
'mod_ssl',
|
|
'openstack-aodh-api',
|
|
'openstack-aodh-common'
|
|
] %}
|
|
{% if distro_python_version.startswith('3') %}
|
|
{% set aodh_base_packages = aodh_base_packages + [
|
|
'python3-ldappool',
|
|
'python3-mod_wsgi'
|
|
] %}
|
|
{% else %}
|
|
{% set aodh_base_packages = aodh_base_packages + [
|
|
'mod_wsgi',
|
|
'python2-ldappool'
|
|
] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
|
RUN mkdir -p /var/www/cgi-bin/aodh \
|
|
&& cp -a /usr/bin/aodh-api /var/www/cgi-bin/aodh/ \
|
|
&& 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 aodh_base_packages = [
|
|
'aodh-common',
|
|
'apache2',
|
|
'libapache2-mod-wsgi-py3',
|
|
'python3-aodh',
|
|
'python3-ldappool'
|
|
] %}
|
|
|
|
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
|
RUN mkdir -p /var/www/cgi-bin/aodh \
|
|
&& cp -a /usr/lib/python3/dist-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/ \
|
|
&& echo > /etc/apache2/ports.conf
|
|
{% endif %}
|
|
|
|
{% elif install_type == 'source' %}
|
|
{% if base_package_type == 'rpm' %}
|
|
|
|
{% set aodh_base_packages = [
|
|
'httpd',
|
|
'mod_ssl',
|
|
] %}
|
|
{% if distro_python_version.startswith('3') %}
|
|
{% set aodh_base_packages = aodh_base_packages + [
|
|
'python3-ldappool',
|
|
'python3-mod_wsgi'
|
|
] %}
|
|
{% else %}
|
|
{% set aodh_base_packages = aodh_base_packages + [
|
|
'mod_wsgi',
|
|
'python2-ldappool'
|
|
] %}
|
|
{% endif %}
|
|
|
|
|
|
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
|
RUN mkdir -p /var/www/cgi-bin/aodh \
|
|
&& 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 aodh_base_packages = [
|
|
'apache2',
|
|
'libapache2-mod-wsgi-py3',
|
|
'python3-ldappool'
|
|
] %}
|
|
|
|
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
|
|
RUN mkdir -p /var/www/cgi-bin/aodh \
|
|
&& echo > /etc/apache2/ports.conf
|
|
{% endif %}
|
|
|
|
ADD aodh-base-archive /aodh-base-source
|
|
|
|
{% set aodh_base_pip_packages = [
|
|
'/aodh',
|
|
'pymongo'
|
|
] %}
|
|
|
|
RUN ln -s aodh-base-source/* aodh \
|
|
&& {{ macros.install_pip(aodh_base_pip_packages | customizable("pip_packages")) }} \
|
|
&& mkdir -p /etc/aodh /var/www/cgi-bin/aodh \
|
|
&& cp /aodh/aodh/api/app.wsgi /var/www/cgi-bin/aodh \
|
|
&& chown -R aodh: /etc/aodh /var/www/cgi-bin/aodh
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_extend_start
|
|
COPY aodh_sudoers /etc/sudoers.d/kolla_aodh_sudoers
|
|
|
|
RUN chmod 750 /etc/sudoers.d \
|
|
&& chmod 640 /etc/sudoers.d/kolla_aodh_sudoers \
|
|
&& chmod 755 /var/www/cgi-bin/aodh \
|
|
&& touch /usr/local/bin/kolla_aodh_extend_start \
|
|
&& chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_aodh_extend_start
|
|
|
|
{% block aodh_base_footer %}{% endblock %}
|