3e5d8e2653
RDO is currently working on python3 support for the next version of CentOS/RHEL based systems. This package uses the distro_python3 flag that was added as part of I4028991bad92c0e8e21066cc4173c06ce5eba393 to use the python3 specific package names. This change only adds python3 package names for RHEL systems. Conflicts-With: https://review.openstack.org/#/c/636457/ Change-Id: Iad6b70b433a0dd1b0f8ae6790fd280594517661a Related-Blueprint: python3-support
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'
|
|
] %}
|
|
{{ 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 %}
|