openstack/kolla
Code Issues Proposed changes

Merge "Refactor httpd install to base image"

Browse Source
This commit is contained in:
Zuul 2020-08-10 17:52:00 +00:00 committed by Gerrit Code Review
commit fd60c65710
26 changed files with 120 additions and 561 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
docker/aodh/aodh-base/Dockerfile.j2
View File

@ -14,61 +14,35 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{# NOTE(aschultz): added api because the common package doesn't include the wsgi file. I think this needs fixing #} {# NOTE(aschultz): added api because the common package doesn't include the wsgi file. I think this needs fixing #}
{% set aodh_base_packages = [ {% set aodh_base_packages = [
'httpd',
'mod_ssl',
'openstack-aodh-api', 'openstack-aodh-api',
'openstack-aodh-common', 'openstack-aodh-common',
'python3-ldappool', 'python3-ldappool'
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/aodh \ RUN mkdir -p /var/www/cgi-bin/aodh \
&& cp -a /usr/bin/aodh-api /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' %} {% elif base_package_type == 'deb' %}
{% set aodh_base_packages = [ {% set aodh_base_packages = [
'aodh-common', 'aodh-common',
'apache2',
'libapache2-mod-wsgi-py3',
'python3-aodh', 'python3-aodh',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/aodh \ RUN mkdir -p /var/www/cgi-bin/aodh \
&& cp -a /usr/lib/python3/dist-packages/aodh/api/app.wsgi /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 %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set aodh_base_packages = [ {% set aodh_base_packages = [
'httpd', 'python3-ldappool'
'mod_ssl', ] %}
'python3-ldappool',
'python3-mod_wsgi'
] %}
{{ macros.install_packages(aodh_base_packages | customizable("packages")) }} {{ macros.install_packages(aodh_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/aodh \ 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 ADD aodh-base-archive /aodh-base-source

10
docker/barbican/barbican-api/Dockerfile.j2
View File

@ -10,30 +10,20 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set barbican_api_packages = [ {% set barbican_api_packages = [
'httpd',
'mod_ssl',
'openstack-barbican-api', 'openstack-barbican-api',
'python3-mod_wsgi',
'uwsgi-plugin-python3' 'uwsgi-plugin-python3'
] %} ] %}
{{ macros.install_packages(barbican_api_packages | customizable("packages")) }} {{ macros.install_packages(barbican_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' %} {% elif base_package_type == 'deb' %}
{% set barbican_api_packages = [ {% set barbican_api_packages = [
'apache2',
'barbican-api', 'barbican-api',
'libapache2-mod-wsgi-py3',
'uwsgi-plugin-python3' 'uwsgi-plugin-python3'
] %} ] %}
{{ macros.install_packages(barbican_api_packages | customizable("packages")) }} {{ macros.install_packages(barbican_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
{% endif %} {% endif %}

37
docker/cinder/cinder-api/Dockerfile.j2
View File

@ -10,51 +10,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'httpd', 'python3-keystone'
'mod_ssl',
'python3-keystone',
'python3-mod_wsgi'
] %} ] %}
{{ 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' %} {% elif base_package_type == 'deb' %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'apache2', 'cinder-api'
'cinder-api',
'libapache2-mod-wsgi-py3'
] %} ] %}
{% endif %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }} {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/cinder \ RUN mkdir -p /var/www/cgi-bin/cinder \
&& cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \ && cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi
&& echo > /etc/apache2/ports.conf
{% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'httpd',
'mod_ssl',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }} {{ 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 \ RUN mkdir -p /var/www/cgi-bin/cinder \
&& cp -a /var/lib/kolla/venv/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi && cp -a /var/lib/kolla/venv/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi

25
docker/cloudkitty/cloudkitty-api/Dockerfile.j2
View File

@ -11,14 +11,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set cloudkitty_api_packages = [ {% set cloudkitty_api_packages = [
'httpd', 'openstack-cloudkitty-api'
'mod_ssl',
'openstack-cloudkitty-api',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} {{ macros.install_packages(cloudkitty_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' %} {% elif base_package_type == 'deb' %}
@ -26,29 +21,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set cloudkitty_api_packages = [ {% set cloudkitty_api_packages = [
'httpd',
'mod_ssl',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }} {{ macros.install_packages(cloudkitty_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 cloudkitty_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{{ macros.install_packages(cloudkitty_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
{% endif %} {% endif %}
COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start

23
docker/cyborg/cyborg-api/Dockerfile.j2
View File

@ -12,29 +12,10 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set cyborg_api_packages = [
'mod_ssl',
'python3-mod_wsgi'
] %}
{% elif base_package_type == 'deb' %}
{% set cyborg_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{% endif %}
{% endif %}
{% set cyborg_api_packages = [
] %}
{{ macros.install_packages(cyborg_api_packages | customizable("packages")) }} {{ macros.install_packages(cyborg_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 %} {% endif %}
COPY extend_start.sh /usr/local/bin/kolla_cyborg_extend_start COPY extend_start.sh /usr/local/bin/kolla_cyborg_extend_start

19
docker/freezer/freezer-api/Dockerfile.j2
View File

@ -14,28 +14,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% set freezer_api_packages = [
{% set freezer_api_packages = [
'httpd',
'mod_ssl',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(freezer_api_packages | customizable("packages")) }} {{ macros.install_packages(freezer_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 freezer_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{{ macros.install_packages(freezer_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
ADD freezer-api-archive /freezer-api-source ADD freezer-api-archive /freezer-api-source
{% set freezer_api_pip_packages = [ {% set freezer_api_pip_packages = [

22
docker/gnocchi/gnocchi-base/Dockerfile.j2
View File

@ -20,23 +20,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'gnocchi-common', 'gnocchi-common',
'httpd',
'mod_ssl',
'python3-boto3', 'python3-boto3',
'python3-cradox', 'python3-cradox',
'python3-ldappool', 'python3-ldappool',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} {{ macros.install_packages(gnocchi_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' %} {% elif base_package_type == 'deb' %}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'apache2',
'build-essential', 'build-essential',
'gnocchi-common', 'gnocchi-common',
'libapache2-mod-wsgi-py3',
'librados-dev', 'librados-dev',
'python3-boto3', 'python3-boto3',
'python3-dev', 'python3-dev',
@ -51,19 +44,15 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
] %} ] %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }} \ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages"), constraints=false, pip_version="pip3") }}
&& truncate -s 0 /etc/apache2/ports.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'httpd',
'librados2-devel', 'librados2-devel',
'mod_ssl', 'python3-ldappool'
'python3-ldappool',
'python3-mod_wsgi'
] %} ] %}
# on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le # on x86-64 pip grabs precompiled numpy/scipy - on aarch64/ppc64le
@ -77,14 +66,10 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
{% endif %} {% endif %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/gnocchi \ RUN mkdir -p /var/www/cgi-bin/gnocchi
&& 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' %} {% elif base_package_type == 'deb' %}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'librados-dev', 'librados-dev',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
@ -100,7 +85,6 @@ RUN mkdir -p /var/www/cgi-bin/gnocchi \
{% endif %} {% endif %}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }} {{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
RUN truncate -s 0 /etc/apache2/ports.conf
{% endif %} {% endif %}
ADD gnocchi-base-archive /gnocchi-base-source ADD gnocchi-base-archive /gnocchi-base-source

31
docker/heat/heat-base/Dockerfile.j2
View File

@ -13,49 +13,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set heat_base_packages = [ {% set heat_base_packages = [
'httpd', 'openstack-heat-common'
'mod_ssl',
'openstack-heat-common',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }} {{ macros.install_packages(heat_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' %} {% elif base_package_type == 'deb' %}
{% set heat_base_packages = [ {% set heat_base_packages = [
'apache2', 'heat-common'
'heat-common',
'libapache2-mod-wsgi-py3'
] %} ] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }} {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set heat_base_packages = [ {% set heat_base_packages = [
'httpd',
'mod_ssl',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }} {{ macros.install_packages(heat_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 heat_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
ADD heat-base-archive /heat-base-source ADD heat-base-archive /heat-base-source

28
docker/horizon/Dockerfile.j2
View File

@ -13,8 +13,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set horizon_packages = [ {% set horizon_packages = [
'gettext', 'gettext',
'httpd',
'mod_ssl',
'openstack-cloudkitty-ui', 'openstack-cloudkitty-ui',
'openstack-dashboard', 'openstack-dashboard',
'openstack-designate-ui', 'openstack-designate-ui',
@ -28,15 +26,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openstack-sahara-ui', 'openstack-sahara-ui',
'openstack-trove-ui', 'openstack-trove-ui',
'openstack-vitrage-ui', 'openstack-vitrage-ui',
'python3-mod_wsgi',
] %} ] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }} {{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% block horizon_redhat_binary_setup %} {% block horizon_redhat_binary_setup %}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ RUN ln -s /usr/share/openstack-dashboard/openstack_dashboard /usr/lib/python{{ distro_python_version }}/site-packages/openstack_dashboard \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf \
&& ln -s /usr/share/openstack-dashboard/openstack_dashboard /usr/lib/python{{ distro_python_version }}/site-packages/openstack_dashboard \
&& ln -s /usr/share/openstack-dashboard/static /usr/lib/python{{ distro_python_version }}/site-packages/static \ && ln -s /usr/share/openstack-dashboard/static /usr/lib/python{{ distro_python_version }}/site-packages/static \
&& chown -R horizon: /etc/openstack-dashboard /usr/share/openstack-dashboard \ && chown -R horizon: /etc/openstack-dashboard /usr/share/openstack-dashboard \
&& chown -R apache: /usr/share/openstack-dashboard/static \ && chown -R apache: /usr/share/openstack-dashboard/static \
@ -51,9 +46,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set horizon_packages = [ {% set horizon_packages = [
'apache2',
'gettext', 'gettext',
'libapache2-mod-wsgi-py3',
'locales', 'locales',
'openstack-dashboard', 'openstack-dashboard',
'python3-designate-dashboard', 'python3-designate-dashboard',
@ -83,8 +76,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{{ macros.install_packages(horizon_packages | customizable("packages")) }} {{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% block horizon_ubuntu_binary_setup %} {% block horizon_ubuntu_binary_setup %}
RUN echo > /etc/apache2/ports.conf \ RUN sed -i 's|\(ServerTokens \)OS|\1Prod|' /etc/apache2/conf-available/security.conf \
&& sed -i 's|\(ServerTokens \)OS|\1Prod|' /etc/apache2/conf-available/security.conf \
&& ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load \ && ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load \
&& ln -s ../mods-available/expires.load /etc/apache2/mods-enabled/expires.load \ && ln -s ../mods-available/expires.load /etc/apache2/mods-enabled/expires.load \
{% if base_distro == 'ubuntu' %} {% if base_distro == 'ubuntu' %}
@ -111,25 +103,14 @@ RUN echo > /etc/apache2/ports.conf \
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set horizon_packages = [ {% set horizon_packages = [
'gettext', 'gettext'
'httpd',
'mod_ssl',
'python3-mod_wsgi',
] %} ] %}
{{ macros.install_packages(horizon_packages | customizable("packages")) }} {{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% block horizon_redhat_source_setup %}
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
{% endblock %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set horizon_packages = [ {% set horizon_packages = [
'apache2',
'gettext', 'gettext',
'libapache2-mod-wsgi-py3',
'locales', 'locales',
'tzdata' 'tzdata'
] %} ] %}
@ -137,8 +118,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
{{ macros.install_packages(horizon_packages | customizable("packages")) }} {{ macros.install_packages(horizon_packages | customizable("packages")) }}
{% block horizon_ubuntu_source_setup %} {% block horizon_ubuntu_source_setup %}
RUN echo > /etc/apache2/ports.conf \ RUN ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load
&& ln -s ../mods-available/headers.load /etc/apache2/mods-enabled/headers.load
{% endblock %} {% endblock %}
{% endif %} {% endif %}

37
docker/ironic/ironic-api/Dockerfile.j2
View File

@ -10,44 +10,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set ironic_api_packages = [ {% set ironic_api_packages = [
'httpd', 'openstack-ironic-api'
'mod_ssl',
'openstack-ironic-api',
'python3-mod_wsgi',
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set ironic_api_packages = [ {% set ironic_api_packages = [
'apache2', 'ironic-api'
'ironic-api',
'libapache2-mod-wsgi-py3'
] %} ] %}
{% endif %} {% endif %}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set ironic_api_packages = [
'httpd',
'mod_ssl',
'python3-mod_wsgi',
] %}
{% elif base_package_type == 'deb' %}
{% set ironic_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{% endif %}
{% endif %}
{{ macros.install_packages(ironic_api_packages | customizable("packages")) }} {{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% set ironic_api_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 {{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
{% elif base_package_type == 'deb' %}
RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start COPY extend_start.sh /usr/local/bin/kolla_ironic_extend_start

8
docker/ironic/ironic-pxe/Dockerfile.j2
View File

@ -9,10 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set ironic_pxe_packages = [ {% set ironic_pxe_packages = [
'httpd',
'ipxe-bootimgs', 'ipxe-bootimgs',
'mod_ssl',
'python3-mod_wsgi',
'tftp-server', 'tftp-server',
] %} ] %}
@ -31,13 +28,9 @@ ENV ironic_arch=aarch64
{% endif %} {% endif %}
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }} {{ macros.install_packages(ironic_pxe_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' %} {% elif base_package_type == 'deb' %}
{% set ironic_pxe_packages = [ {% set ironic_pxe_packages = [
'apache2',
'ipxe', 'ipxe',
'libapache2-mod-wsgi-py3',
'pxelinux', 'pxelinux',
'syslinux-common', 'syslinux-common',
'tftpd-hpa' 'tftpd-hpa'
@ -55,7 +48,6 @@ ENV ironic_arch=aarch64
{% endif %} {% endif %}
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }} {{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
COPY tftp-map-file /map-file COPY tftp-map-file /map-file

24
docker/keystone/keystone-base/Dockerfile.j2
View File

@ -12,14 +12,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'httpd',
'mod_auth_mellon', 'mod_auth_mellon',
'mod_auth_openidc', 'mod_auth_openidc',
'mod_ssl',
'openstack-keystone', 'openstack-keystone',
'python3-keystoneclient', 'python3-keystoneclient',
'python3-ldappool', 'python3-ldappool'
'python3-mod_wsgi'
] %} ] %}
RUN dnf module enable mod_auth_openidc -y RUN dnf module enable mod_auth_openidc -y
@ -27,17 +24,13 @@ RUN dnf module enable mod_auth_openidc -y
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/keystone \ RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \ && cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
&& cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \ && cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin
&& 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' %} {% elif base_package_type == 'deb' %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'apache2',
'keystone', 'keystone',
'libapache2-mod-auth-mellon', 'libapache2-mod-auth-mellon',
'libapache2-mod-auth-openidc', 'libapache2-mod-auth-openidc',
'libapache2-mod-wsgi-py3',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
@ -45,38 +38,27 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
RUN mkdir -p /var/www/cgi-bin/keystone \ RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \ && cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
&& cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \ && cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
&& echo > /etc/apache2/ports.conf \
&& rm -f /etc/apache2/sites-enabled/keystone.conf && rm -f /etc/apache2/sites-enabled/keystone.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'httpd',
'mod_auth_mellon', 'mod_auth_mellon',
'mod_auth_openidc', 'mod_auth_openidc',
'mod_ssl', 'python3-ldappool'
'python3-ldappool',
'python3-mod_wsgi'
] %} ] %}
RUN dnf module enable mod_auth_openidc -y RUN dnf module enable mod_auth_openidc -y
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }} {{ macros.install_packages(keystone_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' %} {% elif base_package_type == 'deb' %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'apache2',
'libapache2-mod-auth-mellon', 'libapache2-mod-auth-mellon',
'libapache2-mod-auth-openidc', 'libapache2-mod-auth-openidc',
'libapache2-mod-wsgi-py3',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
{{ macros.install_packages(keystone_base_packages | customizable("packages")) }} {{ macros.install_packages(keystone_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
{% block keystone_source_install %} {% block keystone_source_install %}

37
docker/manila/manila-api/Dockerfile.j2
View File

@ -10,50 +10,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set manila_api_packages = [ {% set manila_api_packages = [
'httpd',
'mod_ssl',
'python3-mod_wsgi',
] %} ] %}
{{ macros.install_packages(manila_api_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/manila \
&& cp -a /usr/bin/manila-wsgi /var/www/cgi-bin/manila/manila-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' %} {% elif base_package_type == 'deb' %}
{% set manila_api_packages = [ {% set manila_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'manila-api' 'manila-api'
] %} ] %}
{% endif %}
{{ macros.install_packages(manila_api_packages | customizable("packages")) }} {{ macros.install_packages(manila_api_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/manila \ RUN mkdir -p /var/www/cgi-bin/manila \
&& cp -a /usr/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi \ && cp -a /usr/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi
&& echo > /etc/apache2/ports.conf
{% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% set manila_api_packages = [
{% set manila_api_packages = [ ] %}
'httpd',
'mod_ssl',
'python3-mod_wsgi',
] %}
{{ macros.install_packages(manila_api_packages | customizable("packages")) }} {{ macros.install_packages(manila_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 manila_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{{ macros.install_packages(manila_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
RUN mkdir -p /var/www/cgi-bin/manila \ RUN mkdir -p /var/www/cgi-bin/manila \
&& cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi && cp -a /var/lib/kolla/venv/bin/manila-wsgi /var/www/cgi-bin/manila/manila-wsgi

13
docker/masakari/masakari-base/Dockerfile.j2
View File

@ -19,28 +19,19 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set masakari_base_packages = [ {% set masakari_base_packages = [
'httpd',
'mod_ssl',
'python3-ldappool', 'python3-ldappool',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }} {{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/masakari \ RUN mkdir -p /var/www/cgi-bin/masakari
&& 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' %} {% elif base_package_type == 'deb' %}
{% set masakari_base_packages = [ {% set masakari_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
{{ macros.install_packages(masakari_base_packages | customizable("packages")) }} {{ macros.install_packages(masakari_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/masakari \ RUN mkdir -p /var/www/cgi-bin/masakari
&& echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
ADD masakari-base-archive /masakari-base-source ADD masakari-base-archive /masakari-base-source

29
docker/mistral/mistral-api/Dockerfile.j2
View File

@ -10,45 +10,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set mistral_api_packages = [ {% set mistral_api_packages = [
'httpd', 'openstack-mistral-api'
'mod_ssl',
'openstack-mistral-api',
'python3-mod_wsgi',
] %} ] %}
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }} {{ macros.install_packages(mistral_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' %} {% elif base_package_type == 'deb' %}
{% set mistral_api_packages = [ {% set mistral_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'mistral-api' 'mistral-api'
] %} ] %}
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }} {{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set mistral_api_packages = [
'httpd',
'mod_ssl',
'python3-mod_wsgi',
] %}
{{ macros.install_packages(mistral_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 mistral_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{% set mistral_api_packages = [
] %}
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }} {{ macros.install_packages(mistral_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
{% endif %} {% endif %}
COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start COPY extend_start.sh /usr/local/bin/kolla_mistral_extend_start

15
docker/monasca/monasca-base/Dockerfile.j2
View File

@ -15,29 +15,16 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set monasca_base_packages = [ {% 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' %} {% elif base_package_type == 'deb' %}
{% set monasca_base_packages = [ {% set monasca_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'librdkafka-dev' 'librdkafka-dev'
] %} ] %}
{% endif %}
{{ macros.install_packages(monasca_base_packages | customizable("packages")) }} {{ macros.install_packages(monasca_base_packages | customizable("packages")) }}
RUN truncate -s 0 /etc/apache2/ports.conf
{% endif %}
{% block monasca_source_install %} {% block monasca_source_install %}

36
docker/nova/nova-api/Dockerfile.j2
View File

@ -11,55 +11,25 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set nova_api_packages = [ {% set nova_api_packages = [
'httpd', 'openstack-nova-api'
'mod_ssl',
'openstack-nova-api',
'python3-mod_wsgi',
] %} ] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }} {{ macros.install_packages(nova_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' %} {% elif base_package_type == 'deb' %}
{% set nova_api_packages = [ {% set nova_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'nova-api', 'nova-api',
'python3-memcache' 'python3-memcache'
] %} ] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }} {{ macros.install_packages(nova_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% set nova_api_packages = [
] %}
{% set nova_api_packages = [
'httpd',
'mod_ssl',
'python3-mod_wsgi',
] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }} {{ macros.install_packages(nova_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 nova_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{{ macros.install_packages(nova_api_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %}
{% endif %} {% endif %}
COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start COPY extend_start.sh /usr/local/bin/kolla_nova_extend_start

29
docker/octavia/octavia-api/Dockerfile.j2
View File

@ -10,17 +10,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set octavia_api_packages = [ {% set octavia_api_packages = [
'httpd',
'mod_ssl',
'openstack-octavia-api', 'openstack-octavia-api',
'python3-mod_wsgi',
'python3-ovn-octavia-provider' 'python3-ovn-octavia-provider'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set octavia_api_packages = [ {% set octavia_api_packages = [
'apache2', 'octavia-api'
'libapache2-mod-wsgi-py3',
'octavia-api',
] %} ] %}
{% if base_distro == 'debian' %} {% if base_distro == 'debian' %}
@ -36,19 +31,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% set octavia_api_packages = [
{% set octavia_api_packages = [ ] %}
'httpd',
'mod_ssl',
'python3-mod_wsgi'
] %}
{% elif base_package_type == 'deb' %}
{% set octavia_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{% endif %}
{% set octavia_api_plugins_pip_packages = [ {% set octavia_api_plugins_pip_packages = [
'/plugins/*' '/plugins/*'
@ -62,13 +46,6 @@ RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_packages(octavia_api_packages | customizable("packages")) }} {{ 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 COPY extend_start.sh /usr/local/bin/kolla_octavia_extend_start
RUN chmod 755 /usr/local/bin/kolla_octavia_extend_start RUN chmod 755 /usr/local/bin/kolla_octavia_extend_start

19
docker/openstack-base/Dockerfile.j2
View File

@ -15,10 +15,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set openstack_base_packages = [ {% set openstack_base_packages = [
'avahi-libs', 'avahi-libs',
'gnutls', 'gnutls',
'httpd',
'initscripts', 'initscripts',
'libxslt', 'libxslt',
'libyaml', 'libyaml',
'mailcap', 'mailcap',
'mod_ssl',
'openssl', 'openssl',
'python3-alembic', 'python3-alembic',
'python3-anyjson', 'python3-anyjson',
@ -49,6 +51,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-migrate', 'python3-migrate',
'python3-mimeparse', 'python3-mimeparse',
'python3-mistralclient', 'python3-mistralclient',
'python3-mod_wsgi',
'python3-muranoclient', 'python3-muranoclient',
'python3-neutronclient', 'python3-neutronclient',
'python3-novaclient', 'python3-novaclient',
@ -93,7 +96,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python3-vitrageclient', 'python3-vitrageclient',
'python3-webob', 'python3-webob',
'python3-zaqarclient', 'python3-zaqarclient',
'systemd-sysv', 'systemd-sysv'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
@ -101,6 +104,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
# This will prevent questions from being asked during the install # This will prevent questions from being asked during the install
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
{% set openstack_base_packages = [ {% set openstack_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'openssl', 'openssl',
'patch', 'patch',
'python3-aodhclient', 'python3-aodhclient',
@ -146,6 +151,7 @@ ENV DEBIAN_FRONTEND noninteractive
'gcc', 'gcc',
'gcc-c++', 'gcc-c++',
'git', 'git',
'httpd',
'iproute', 'iproute',
'libffi-devel', 'libffi-devel',
'libxml2-devel', 'libxml2-devel',
@ -153,6 +159,7 @@ ENV DEBIAN_FRONTEND noninteractive
'libyaml-devel', 'libyaml-devel',
'make', 'make',
'mariadb-devel', 'mariadb-devel',
'mod_ssl',
'openldap-devel', 'openldap-devel',
'openssl', 'openssl',
'openssl-devel', 'openssl-devel',
@ -160,15 +167,18 @@ ENV DEBIAN_FRONTEND noninteractive
'postgresql', 'postgresql',
'postgresql-devel', 'postgresql-devel',
'python3-devel', 'python3-devel',
'python3-mod_wsgi',
'sqlite-devel', 'sqlite-devel',
'zip' 'zip'
] %} ] %}
{% elif base_package_type == 'deb' %} {% elif base_package_type == 'deb' %}
{% set openstack_base_packages = [ {% set openstack_base_packages = [
'apache2',
'build-essential', 'build-essential',
'ca-certificates', 'ca-certificates',
'git', 'git',
'libapache2-mod-wsgi-py3',
'libffi-dev', 'libffi-dev',
'libmariadb-dev-compat', 'libmariadb-dev-compat',
'libpcre3-dev', 'libpcre3-dev',
@ -319,4 +329,11 @@ RUN {{ macros.install_pip(openstack_base_pip_packages | customizable("pip_packag
{% endif %} {% endif %}
{% 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 %}
{% block openstack_base_footer %}{% endblock %} {% block openstack_base_footer %}{% endblock %}

25
docker/panko/panko-base/Dockerfile.j2
View File

@ -13,46 +13,29 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set panko_base_packages = [ {% set panko_base_packages = [
'httpd',
'mod_ssl',
'openstack-panko-common', 'openstack-panko-common',
'python3-ldappool', 'python3-ldappool'
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(panko_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' %} {% elif base_package_type == 'deb' %}
{% set panko_base_packages = [ {% set panko_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %} ] %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set panko_base_packages = [ {% set panko_base_packages = [
'httpd', 'python3-ldappool'
'mod_ssl',
'python3-ldappool',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }} {{ macros.install_packages(panko_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' %} {% elif base_package_type == 'deb' %}
{% set panko_base_packages = [ {% set panko_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
{{ macros.install_packages(panko_base_packages | customizable("packages")) }} {{ macros.install_packages(panko_base_packages | customizable("packages")) }}
RUN truncate -s 0 /etc/apache2/ports.conf
{% endif %} {% endif %}
ADD panko-base-archive /panko-base-source ADD panko-base-archive /panko-base-source

34
docker/placement/placement-api/Dockerfile.j2
View File

@ -11,52 +11,26 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set placement_api_packages = [ {% set placement_api_packages = [
'httpd', 'openstack-placement-api'
'mod_ssl',
'openstack-placement-api',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(placement_api_packages | customizable("packages")) }} {{ macros.install_packages(placement_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' %} {% elif base_package_type == 'deb' %}
{% set placement_api_packages = [ {% set placement_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'placement-api' 'placement-api'
] %} ] %}
{{ macros.install_packages(placement_api_packages | customizable("packages")) }} {{ macros.install_packages(placement_api_packages | customizable("packages")) }}
RUN truncate -s 0 /etc/apache2/ports.conf \ RUN rm -f /etc/apache2/sites-enabled/placement-api.conf
&& rm -f /etc/apache2/sites-enabled/placement-api.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
{% set placement_api_packages = [
'httpd',
'mod_ssl',
'python3-mod_wsgi'
] %}
{% set placement_api_packages = [
] %}
{{ macros.install_packages(placement_api_packages | customizable("packages")) }} {{ macros.install_packages(placement_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 placement_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3'
] %}
{{ macros.install_packages(placement_api_packages | customizable("packages")) }}
RUN truncate -s 0 /etc/apache2/ports.conf
{% endif %}
{% endif %} {% endif %}
COPY extend_start.sh /usr/local/bin/kolla_placement_extend_start COPY extend_start.sh /usr/local/bin/kolla_placement_extend_start

18
docker/qinling/qinling-base/Dockerfile.j2
View File

@ -19,30 +19,20 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set qinling_base_packages = [ {% set qinling_base_packages = [
'httpd', 'python3-ldappool'
'mod_ssl',
'python3-ldappool',
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(qinling_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/qinling \
&& 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' %} {% elif base_package_type == 'deb' %}
{% set qinling_base_packages = [ {% set qinling_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
{{ macros.install_packages(qinling_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/qinling \
&& echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
{{ macros.install_packages(qinling_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/qinling
ADD qinling-base-archive /qinling-base-source ADD qinling-base-archive /qinling-base-source
{% set qinling_base_pip_packages = [ {% set qinling_base_pip_packages = [

12
docker/vitrage/vitrage-api/Dockerfile.j2
View File

@ -12,31 +12,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set vitrage_api_packages = [ {% set vitrage_api_packages = [
'httpd',
'mod_ssl',
'openstack-vitrage-api', 'openstack-vitrage-api',
'python3-ldappool', 'python3-ldappool'
'python3-mod_wsgi'
] %} ] %}
{{ macros.install_packages(vitrage_api_packages | customizable("packages")) }} {{ macros.install_packages(vitrage_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' %} {% elif base_package_type == 'deb' %}
{% if base_distro == 'debian' %} {% if base_distro == 'debian' %}
{% set vitrage_api_packages = [ {% set vitrage_api_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'python3-ldappool', 'python3-ldappool',
'vitrage-api' 'vitrage-api'
] %} ] %}
{{ macros.install_packages(vitrage_api_packages | customizable("packages")) }} {{ macros.install_packages(vitrage_api_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/vitrage \ RUN mkdir -p /var/www/cgi-bin/vitrage \
&& cp -a /usr/lib/python3/dist-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/ \ && cp -a /usr/lib/python3/dist-packages/vitrage/api/app.wsgi /var/www/cgi-bin/vitrage/
&& echo > /etc/apache2/ports.conf
{% else %} {% else %}

24
docker/vitrage/vitrage-base/Dockerfile.j2
View File

@ -45,26 +45,18 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set vitrage_base_packages = [ {% set vitrage_base_packages = [
'httpd',
'mod_ssl',
'python3-ldappool',
'python3-mod_wsgi'
] %}
{{ macros.install_packages(vitrage_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 vitrage_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} {{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
RUN echo > /etc/apache2/ports.conf
{% elif base_package_type == 'deb' %}
{% set vitrage_base_packages = [
'python3-ldappool'
] %}
{{ macros.install_packages(vitrage_base_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% set vitrage_base_pip_packages = [ {% set vitrage_base_pip_packages = [

56
docker/zaqar/zaqar-base/Dockerfile.j2
View File

@ -14,57 +14,41 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set zaqar_base_packages = [ {% set zaqar_base_packages = [
'openstack-zaqar', 'openstack-zaqar',
'httpd',
'mod_ssl',
'python3-ldappool',
'python3-mod_wsgi'
] %}
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \
&& mkdir -p /var/www/cgi-bin/zaqar \
&& chown -R zaqar: /var/www/cgi-bin/zaqar \
&& cp -a /usr/lib/python{{ distro_python_version }}/site-packages/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar/ \
&& 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 zaqar_base_packages = [
'zaqar-common',
'apache2',
'libapache2-mod-wsgi-py3',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \ {{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \
&& mkdir -p /var/www/cgi-bin/zaqar \ && mkdir -p /var/www/cgi-bin/zaqar \
&& chown -R zaqar: /var/www/cgi-bin/zaqar \ && chown -R zaqar: /var/www/cgi-bin/zaqar \
&& cp -a /usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar/ \ && cp -a /usr/lib/python{{ distro_python_version }}/site-packages/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar/
&& echo > /etc/apache2/ports.conf
{% elif base_package_type == 'deb' %}
{% set zaqar_base_packages = [
'zaqar-common',
'python3-ldappool'
] %}
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \
&& mkdir -p /var/www/cgi-bin/zaqar \
&& chown -R zaqar: /var/www/cgi-bin/zaqar \
&& cp -a /usr/lib/python3/dist-packages/zaqar/transport/wsgi/app.py /var/www/cgi-bin/zaqar/
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set zaqar_base_packages = [ {% set zaqar_base_packages = [
'httpd',
'mod_ssl',
'python3-ldappool',
'python3-mod_wsgi'
] %}
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \
&& 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 zaqar_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }} \ {{ macros.install_packages(zaqar_base_packages | customizable("packages")) }}
&& echo > /etc/apache2/ports.conf
{% elif base_package_type == 'deb' %}
{% set zaqar_base_packages = [
'python3-ldappool'
] %}
{{ macros.install_packages(zaqar_base_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% set zaqar_base_pip_packages = [ {% set zaqar_base_pip_packages = [

30
docker/zun/zun-base/Dockerfile.j2
View File

@ -19,30 +19,22 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% if base_package_type == 'rpm' %} {% if base_package_type == 'rpm' %}
{% set zun_base_packages = [ {% set zun_base_packages = [
'httpd',
'mod_ssl',
'numactl',
'python3-ldappool',
'python3-mod_wsgi'
] %}
{{ macros.install_packages(zun_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/zun \
&& 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 zun_base_packages = [
'apache2',
'libapache2-mod-wsgi-py3',
'numactl', 'numactl',
'python3-ldappool' 'python3-ldappool'
] %} ] %}
{{ macros.install_packages(zun_base_packages | customizable("packages")) }} {{ macros.install_packages(zun_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/zun \ RUN mkdir -p /var/www/cgi-bin/zun
&& echo > /etc/apache2/ports.conf
{% elif base_package_type == 'deb' %}
{% set zun_base_packages = [
'numactl',
'python3-ldappool'
] %}
{{ macros.install_packages(zun_base_packages | customizable("packages")) }}
RUN mkdir -p /var/www/cgi-bin/zun
{% endif %} {% endif %}
ADD zun-base-archive /zun-base-source ADD zun-base-archive /zun-base-source