d436001b43
Commit 43b74ccc157c0b50138c3785ed91dab504895571 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
83 lines
2.9 KiB
Django/Jinja
83 lines
2.9 KiB
Django/Jinja
FROM {{ namespace }}/{{ image_prefix }}cinder-base:{{ tag }}
|
|
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
|
|
|
|
{% block cinder_api_header %}{% endblock %}
|
|
|
|
{% import "macros.j2" as macros with context %}
|
|
|
|
{% if install_type == 'binary' %}
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set cinder_api_packages = [
|
|
'httpd',
|
|
'mod_ssl',
|
|
] %}
|
|
|
|
{% if distro_python_version.startswith('3') %}
|
|
{% set cinder_api_packages = cinder_api_packages + [
|
|
'python3-keystone',
|
|
'python3-mod_wsgi'
|
|
] %}
|
|
{% else %}
|
|
{% set cinder_api_packages = cinder_api_packages + [
|
|
'mod_wsgi',
|
|
'python-keystone'
|
|
] %}
|
|
{% endif %}
|
|
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
|
|
RUN mkdir -p /var/www/cgi-bin/cinder \
|
|
&& cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \
|
|
&& 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 cinder_api_packages = [
|
|
'apache2',
|
|
'cinder-api',
|
|
'libapache2-mod-wsgi-py3'
|
|
] %}
|
|
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
|
|
RUN mkdir -p /var/www/cgi-bin/cinder \
|
|
&& cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \
|
|
&& echo > /etc/apache2/ports.conf
|
|
{% endif %}
|
|
|
|
{% elif install_type == 'source' %}
|
|
|
|
{% if base_package_type == 'rpm' %}
|
|
{% set cinder_api_packages = [
|
|
'httpd',
|
|
'mod_ssl',
|
|
] %}
|
|
{% if distro_python_version.startswith('3') %}
|
|
{% set cinder_api_packages = cinder_api_packages + ['python3-mod_wsgi'] %}
|
|
{% else %}
|
|
{% set cinder_api_packages = cinder_api_packages + ['mod_wsgi'] %}
|
|
{% endif %}
|
|
|
|
{{ macros.install_packages(cinder_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 cinder_api_packages = [
|
|
'apache2',
|
|
'libapache2-mod-wsgi-py3'
|
|
] %}
|
|
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
|
|
RUN echo > /etc/apache2/ports.conf
|
|
|
|
{% endif %}
|
|
|
|
RUN mkdir -p /var/www/cgi-bin/cinder \
|
|
&& cp -a /var/lib/kolla/venv/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi
|
|
|
|
{% endif %}
|
|
|
|
COPY extend_start.sh /usr/local/bin/kolla_cinder_extend_start
|
|
RUN chmod 755 /usr/local/bin/kolla_cinder_extend_start \
|
|
&& chown -R cinder: /var/www/cgi-bin/cinder \
|
|
&& chmod 755 /var/www/cgi-bin/cinder/cinder-wsgi
|
|
|
|
{% block cinder_api_footer %}{% endblock %}
|
|
{% block footer %}{% endblock %}
|