openstack/kolla
Code Issues Proposed changes

Use base_package_type

Browse Source 
This change updates the docker files to use base_package_type instead
of doing specific distro checks for the rhel/deb generic cases. The
base_distro is still available and is used when a specific distro needs
a customization but if the differences are purely rpm vs deb, then the
base_package_type can be used.

Change-Id: I8d720bb185df65a0178061ccf20b1ab2265da2c5
This commit is contained in:
Alex Schultz 2019-01-15 16:58:25 -07:00
parent fca732b81e
commit ae1322ec10
203 changed files with 487 additions and 487 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/aodh/aodh-api/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set aodh_api_packages = ['openstack-aodh-api'] %} {% set aodh_api_packages = ['openstack-aodh-api'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set aodh_api_packages = ['aodh-api'] %} {% set aodh_api_packages = ['aodh-api'] %}
{% endif %} {% endif %}
{{ macros.install_packages(aodh_api_packages | customizable("packages")) }} {{ macros.install_packages(aodh_api_packages | customizable("packages")) }}

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

@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='aodh') }} {{ macros.configure_user(name='aodh') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set aodh_base_packages = [ {% set aodh_base_packages = [
'httpd', 'httpd',
@ -23,7 +23,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
&& cp -a /usr/lib/python2.7/site-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/ \ && cp -a /usr/lib/python2.7/site-packages/aodh/api/app.wsgi /var/www/cgi-bin/aodh/ \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set aodh_base_packages = [ {% set aodh_base_packages = [
'aodh-common', 'aodh-common',
@ -40,7 +40,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set aodh_base_packages = [ {% set aodh_base_packages = [
'httpd', 'httpd',
@ -53,7 +53,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
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 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set aodh_base_packages = [ {% set aodh_base_packages = [
'apache2', 'apache2',

4
docker/aodh/aodh-evaluator/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set aodh_evaluator_packages = ['openstack-aodh-evaluator'] %} {% set aodh_evaluator_packages = ['openstack-aodh-evaluator'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set aodh_evaluator_packages = ['aodh-evaluator'] %} {% set aodh_evaluator_packages = ['aodh-evaluator'] %}
{% endif %} {% endif %}
{{ macros.install_packages(aodh_evaluator_packages | customizable("packages")) }} {{ macros.install_packages(aodh_evaluator_packages | customizable("packages")) }}

4
docker/aodh/aodh-expirer/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set aodh_expirer_packages = ['openstack-aodh-expirer'] %} {% set aodh_expirer_packages = ['openstack-aodh-expirer'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set aodh_expirer_packages = ['aodh-expirer'] %} {% set aodh_expirer_packages = ['aodh-expirer'] %}
{% endif %} {% endif %}
{{ macros.install_packages(aodh_expirer_packages | customizable("packages")) }} {{ macros.install_packages(aodh_expirer_packages | customizable("packages")) }}

4
docker/aodh/aodh-listener/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set aodh_listener_packages = ['openstack-aodh-listener'] %} {% set aodh_listener_packages = ['openstack-aodh-listener'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set aodh_listener_packages = ['aodh-listener'] %} {% set aodh_listener_packages = ['aodh-listener'] %}
{% endif %} {% endif %}
{{ macros.install_packages(aodh_listener_packages | customizable("packages")) }} {{ macros.install_packages(aodh_listener_packages | customizable("packages")) }}

4
docker/aodh/aodh-notifier/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set aodh_notifier_packages = ['openstack-aodh-notifier'] %} {% set aodh_notifier_packages = ['openstack-aodh-notifier'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set aodh_notifier_packages = ['aodh-notifier'] %} {% set aodh_notifier_packages = ['aodh-notifier'] %}
{% endif %} {% endif %}
{{ macros.install_packages(aodh_notifier_packages | customizable("packages")) }} {{ macros.install_packages(aodh_notifier_packages | customizable("packages")) }}

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

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set barbican_api_packages = [ {% set barbican_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -20,7 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set barbican_api_packages = [ {% set barbican_api_packages = [
'apache2', 'apache2',
'barbican-api', 'barbican-api',

8
docker/barbican/barbican-base/Dockerfile.j2
View File

@ -8,18 +8,18 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='barbican', groups='nfast') }} {{ macros.configure_user(name='barbican', groups='nfast') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set barbican_base_packages = ['openstack-barbican-common'] %} {% set barbican_base_packages = ['openstack-barbican-common'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set barbican_base_packages = ['barbican-common'] %} {% set barbican_base_packages = ['barbican-common'] %}
{% endif %} {% endif %}
{{ macros.install_packages(barbican_base_packages | customizable("packages")) }} {{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %} {% set barbican_base_packages = ['uwsgi-plugin-python'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %} {% set barbican_base_packages = ['uwsgi-plugin-python'] %}
{% endif %} {% endif %}

4
docker/barbican/barbican-keystone-listener/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set barbican_keystone_listener_packages = ['openstack-barbican-keystone-listener'] %} {% set barbican_keystone_listener_packages = ['openstack-barbican-keystone-listener'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %} {% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %}
{% endif %} {% endif %}

4
docker/barbican/barbican-worker/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set barbican_worker_packages = ['openstack-barbican-worker'] %} {% set barbican_worker_packages = ['openstack-barbican-worker'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set barbican_worker_packages = ['barbican-worker'] %} {% set barbican_worker_packages = ['barbican-worker'] %}
{% endif %} {% endif %}

10
docker/base/Dockerfile.j2
View File

@ -27,7 +27,7 @@ RUN cat /tmp/kolla_bashrc >> /etc/skel/.bashrc \
# PS1 var when used /bin/sh shell # PS1 var when used /bin/sh shell
ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(hostname -s) $(pwd)]$ " ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(hostname -s) $(pwd)]$ "
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
# For RPM Variants, enable the correct repositories - this should all be done # For RPM Variants, enable the correct repositories - this should all be done
# in the base image so repos are consistent throughout the system. This also # in the base image so repos are consistent throughout the system. This also
# enables to provide repo overrides at a later date in a simple fashion if we # enables to provide repo overrides at a later date in a simple fashion if we
@ -210,7 +210,7 @@ RUN yum -y install \
#### END REPO ENABLEMENT #### END REPO ENABLEMENT
{# We are back to the basic if conditional here which is: {# We are back to the basic if conditional here which is:
if base_distro in ['centos', 'oraclelinux', 'rhel'] #} if base_package_type == 'rpm' #}
{% set base_compiler_packages = [ {% set base_compiler_packages = [
'gcc', 'gcc',
@ -252,8 +252,8 @@ RUN yum -y install \
{% endif %} {% endif %}
{# endif for install type is source for RPM based distros #} {# endif for install type is source for RPM based distros #}
{# endif for base_distro centos,oraclelinux,rhel #} {# endif for base_package_type rpm #}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN if [ $(awk -F '=' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) != "{{ supported_distro_release }}" ]; then \ RUN if [ $(awk -F '=' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) != "{{ supported_distro_release }}" ]; then \
echo "Only release '{{ supported_distro_release }}' is supported on {{ base_distro }}"; false; fi echo "Only release '{{ supported_distro_release }}' is supported on {{ base_distro }}"; false; fi
@ -391,7 +391,7 @@ RUN sed -i \
&& ln -s dist-packages /usr/lib/python2.7/site-packages && ln -s dist-packages /usr/lib/python2.7/site-packages
{% endif %} {% endif %}
{# endif for base_distro debian, ubuntu #} {# endif base_package_type deb #}
{% endif %} {% endif %}
COPY set_configs.py /usr/local/bin/kolla_set_configs COPY set_configs.py /usr/local/bin/kolla_set_configs

8
docker/bifrost/bifrost-base/Dockerfile.j2
View File

@ -26,17 +26,17 @@ RUN ln -s bifrost-base-source/* bifrost \
WORKDIR /bifrost WORKDIR /bifrost
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{# Remove updated RabbitMQ packages since these are not supported by Bifrost yet. #} {# Remove updated RabbitMQ packages since these are not supported by Bifrost yet. #}
RUN rm -f /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo \ RUN rm -f /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo \
&& yum clean all && rm -rf /var/yum/cache && yum clean all && rm -rf /var/yum/cache
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list \ RUN sed -e "s/.*mariadb.*//Ig" -e "s/.*rabbitmq.*//Ig" -i /etc/apt/sources.list \
&& apt-get purge -y mariadb* mysql* && apt-get purge -y mariadb* mysql*
{% endif %} {% endif %}
{% block bifrost_ansible_install %} {% block bifrost_ansible_install %}
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
RUN apt-get update && \ RUN apt-get update && \
{% else %} {% else %}
RUN echo " " && \ RUN echo " " && \
@ -44,7 +44,7 @@ RUN echo " " && \
bash -c './scripts/env-setup.sh && source ./env-vars && \ bash -c './scripts/env-setup.sh && source ./env-vars && \
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \ ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
-e @/tmp/build_arg.yml && \ -e @/tmp/build_arg.yml && \
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
apt-get clean && rm -rf /var/lib/apt/lists/*' apt-get clean && rm -rf /var/lib/apt/lists/*'
{% else %} {% else %}
yum clean all && rm -rf /var/yum/cache' yum clean all && rm -rf /var/yum/cache'

4
docker/ceilometer/ceilometer-base/Dockerfile.j2
View File

@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ceilometer') }} {{ macros.configure_user(name='ceilometer') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ceilometer_base_packages = [ {% set ceilometer_base_packages = [
'openstack-ceilometer-common', 'openstack-ceilometer-common',
'python-panko', 'python-panko',
@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-oslo-db', 'python-oslo-db',
'python-tooz' 'python-tooz'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ceilometer_base_packages = [ {% set ceilometer_base_packages = [
'ceilometer-common', 'ceilometer-common',
'python-gnocchiclient', 'python-gnocchiclient',

4
docker/ceilometer/ceilometer-central/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ceilometer_central_packages = ['openstack-ceilometer-central'] %} {% set ceilometer_central_packages = ['openstack-ceilometer-central'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ceilometer_central_packages = ['ceilometer-agent-central'] %} {% set ceilometer_central_packages = ['ceilometer-agent-central'] %}
{% endif %} {% endif %}

8
docker/ceilometer/ceilometer-compute/Dockerfile.j2
View File

@ -6,11 +6,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ceilometer_compute_packages = [ {% set ceilometer_compute_packages = [
'openstack-ceilometer-compute', 'openstack-ceilometer-compute',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ceilometer_compute_packages = [ {% set ceilometer_compute_packages = [
'ceilometer-agent-compute', 'ceilometer-agent-compute',
'python-libvirt' 'python-libvirt'
@ -19,11 +19,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }} {{ macros.install_packages(ceilometer_compute_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ceilometer_compute_packages = [ {% set ceilometer_compute_packages = [
'libvirt-python' 'libvirt-python'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ceilometer_compute_packages = [ {% set ceilometer_compute_packages = [
'python-libvirt' 'python-libvirt'
] %} ] %}

8
docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
View File

@ -6,22 +6,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ceilometer_ipmi_packages = [ {% set ceilometer_ipmi_packages = [
'openstack-ceilometer-ipmi' 'openstack-ceilometer-ipmi'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ceilometer_ipmi_packages = [ {% set ceilometer_ipmi_packages = [
'ceilometer-agent-ipmi' 'ceilometer-agent-ipmi'
] %} ] %}
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ceilometer_ipmi_packages = [ {% set ceilometer_ipmi_packages = [
'ipmitool' 'ipmitool'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ceilometer_ipmi_packages = [ {% set ceilometer_ipmi_packages = [
'ipmitool' 'ipmitool'
] %} ] %}

4
docker/ceilometer/ceilometer-notification/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ceilometer_notification_packages = ['openstack-ceilometer-notification'] %} {% set ceilometer_notification_packages = ['openstack-ceilometer-notification'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %} {% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %}
{% endif %} {% endif %}

4
docker/ceph/ceph-base/Dockerfile.j2
View File

@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ceph') }} {{ macros.configure_user(name='ceph') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ceph_base_packages = [ {% set ceph_base_packages = [
'btrfs-progs', 'btrfs-progs',
@ -25,7 +25,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{% endif %} {% endif %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ceph_base_packages = [ {% set ceph_base_packages = [
'btrfs-progs', 'btrfs-progs',

4
docker/ceph/ceph-nfs/Dockerfile.j2
View File

@ -5,13 +5,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ceph_nfs_packages = [ {% set ceph_nfs_packages = [
'nfs-ganesha', 'nfs-ganesha',
'nfs-ganesha-ceph' 'nfs-ganesha-ceph'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ceph_nfs_packages = [ {% set ceph_nfs_packages = [
'nfs-ganesha', 'nfs-ganesha',
'nfs-ganesha-ceph' 'nfs-ganesha-ceph'

4
docker/certmonger/Dockerfile.j2
View File

@ -5,11 +5,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set certmonger_packages = [ {% set certmonger_packages = [
'certmonger', 'certmonger',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set certmonger_packages = [ {% set certmonger_packages = [
'certmonger' 'certmonger'
] %} ] %}

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

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -19,7 +19,7 @@ RUN mkdir -p /var/www/cgi-bin/cinder \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'apache2', 'apache2',
'cinder-api', 'cinder-api',
@ -33,7 +33,7 @@ RUN mkdir -p /var/www/cgi-bin/cinder \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -43,7 +43,7 @@ RUN mkdir -p /var/www/cgi-bin/cinder \
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set cinder_api_packages = [ {% set cinder_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'

8
docker/cinder/cinder-backup/Dockerfile.j2
View File

@ -6,11 +6,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cinder_backup_packages = [ {% set cinder_backup_packages = [
'nfs-utils' 'nfs-utils'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set cinder_backup_packages = [ {% set cinder_backup_packages = [
'cinder-backup', 'cinder-backup',
'nfs-common' 'nfs-common'
@ -18,11 +18,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cinder_backup_packages = [ {% set cinder_backup_packages = [
'nfs-utils' 'nfs-utils'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set cinder_backup_packages = [ {% set cinder_backup_packages = [
'nfs-common' 'nfs-common'
] %} ] %}

8
docker/cinder/cinder-base/Dockerfile.j2
View File

@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='cinder') }} {{ macros.configure_user(name='cinder') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cinder_base_packages = [ {% set cinder_base_packages = [
'ceph-common', 'ceph-common',
'lvm2', 'lvm2',
@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-automaton', 'python-automaton',
'python-oslo-vmware' 'python-oslo-vmware'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set cinder_base_packages = [ {% set cinder_base_packages = [
'ceph-common', 'ceph-common',
'cinder-common', 'cinder-common',
@ -29,7 +29,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(cinder_base_packages | customizable("packages")) }} {{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cinder_base_packages = [ {% set cinder_base_packages = [
'ceph-common', 'ceph-common',
'lvm2', 'lvm2',
@ -44,7 +44,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'qemu-img' 'qemu-img'
] %} ] %}
{% endif %} {% endif %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set cinder_base_packages = [ {% set cinder_base_packages = [
'ceph-common', 'ceph-common',
'lvm2', 'lvm2',

2
docker/cinder/cinder-scheduler/Dockerfile.j2
View File

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
{% set cinder_scheduler_packages = [ {% set cinder_scheduler_packages = [
'cinder-scheduler' 'cinder-scheduler'
] %} ] %}

6
docker/cinder/cinder-volume/Dockerfile.j2
View File

@ -5,7 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cinder_volume_packages = [ {% set cinder_volume_packages = [
'nfs-utils', 'nfs-utils',
'nvmetcli', 'nvmetcli',
@ -20,7 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
{% endblock %} {% endblock %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set cinder_volume_packages = [ {% set cinder_volume_packages = [
'nfs-common', 'nfs-common',
'sysfsutils', 'sysfsutils',
@ -39,7 +39,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
{% endif %} {% endif %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
{% set cinder_volume_packages = [ {% set cinder_volume_packages = [
'cinder-volume', 'cinder-volume',
'python-rtslib-fb', 'python-rtslib-fb',

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

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cloudkitty_api_packages = [ {% set cloudkitty_api_packages = [
'httpd', 'httpd',
@ -18,7 +18,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false
@ -27,7 +27,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cloudkitty_api_packages = [ {% set cloudkitty_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -37,7 +37,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_package_type == 'deb' %}
{% set cloudkitty_api_packages = [ {% set cloudkitty_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'

4
docker/cloudkitty/cloudkitty-base/Dockerfile.j2
View File

@ -8,13 +8,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='cloudkitty') }} {{ macros.configure_user(name='cloudkitty') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cloudkitty_base_packages = [ {% set cloudkitty_base_packages = [
'openstack-cloudkitty-common', 'openstack-cloudkitty-common',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false

4
docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
View File

@ -6,13 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cloudkitty_processor_packages = [ {% set cloudkitty_processor_packages = [
'openstack-cloudkitty-processor', 'openstack-cloudkitty-processor',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false

2
docker/collectd/Dockerfile.j2
View File

@ -11,7 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'collectd' 'collectd'
] %} ] %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set collectd_packages = collectd_packages + [ {% set collectd_packages = collectd_packages + [
'collectd-amqp1', 'collectd-amqp1',
'collectd-apache', 'collectd-apache',

4
docker/congress/congress-base/Dockerfile.j2
View File

@ -8,12 +8,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='congress') }} {{ macros.configure_user(name='congress') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
{% set congress_base_packages = [ {% set congress_base_packages = [
'congress-common', 'congress-common',
'congress-server'] 'congress-server']
%} %}
{% elif base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% elif base_package_type == 'rpm' %}
{% set congress_base_packages = [ {% set congress_base_packages = [
'openstack-congress'] 'openstack-congress']
%} %}

4
docker/crane/Dockerfile.j2
View File

@ -26,7 +26,7 @@ RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set crane_packages = [ {% set crane_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -40,7 +40,7 @@ RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false
{% endif %} {% endif %}

4
docker/cron/Dockerfile.j2
View File

@ -5,12 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set cron_packages = [ {% set cron_packages = [
'cronie', 'cronie',
'logrotate' 'logrotate'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set cron_packages = [ {% set cron_packages = [
'cron', 'cron',
'logrotate' 'logrotate'

4
docker/designate/designate-api/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_api_packages = ['openstack-designate-api'] %} {% set designate_api_packages = ['openstack-designate-api'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set designate_api_packages = ['designate-api'] %} {% set designate_api_packages = ['designate-api'] %}
{% endif %} {% endif %}
{{ macros.install_packages(designate_api_packages | customizable("packages")) }} {{ macros.install_packages(designate_api_packages | customizable("packages")) }}

6
docker/designate/designate-backend-bind9/Dockerfile.j2
View File

@ -5,19 +5,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_backend_bind9_packages = ['bind'] %} {% set designate_backend_bind9_packages = ['bind'] %}
{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }} {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set designate_backend_bind9_packages = ['bind9'] %} {% set designate_backend_bind9_packages = ['bind9'] %}
{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }} {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
{% endif %} {% endif %}
{% set designate_backend_bind_name = 'bind' if base_distro in ['debian', 'ubuntu'] else 'named' %} {% set designate_backend_bind_name = 'bind' if base_package_type == 'deb' else 'named' %}
RUN mkdir -p /var/lib/kolla/ /var/lib/{{ designate_backend_bind_name }}/ /run/{{ designate_backend_bind_name }} \ RUN mkdir -p /var/lib/kolla/ /var/lib/{{ designate_backend_bind_name }}/ /run/{{ designate_backend_bind_name }} \
&& chown -R root: /var/lib/{{ designate_backend_bind_name }} /run/{{ designate_backend_bind_name }} \ && chown -R root: /var/lib/{{ designate_backend_bind_name }} /run/{{ designate_backend_bind_name }} \

4
docker/designate/designate-base/Dockerfile.j2
View File

@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='designate') }} {{ macros.configure_user(name='designate') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_base_packages = [ {% set designate_base_packages = [
'openstack-designate-common', 'openstack-designate-common',
'python-tooz', 'python-tooz',
@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{{ macros.install_packages(designate_base_packages | customizable("packages")) }} {{ macros.install_packages(designate_base_packages | customizable("packages")) }}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set designate_base_packages = [ {% set designate_base_packages = [
'designate-common', 'designate-common',
'python-tooz' 'python-tooz'

4
docker/designate/designate-central/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_central_packages = ['openstack-designate-central'] %} {% set designate_central_packages = ['openstack-designate-central'] %}
{% elif base_distro in ['debian', 'ubuntu']%} {% elif base_package_type == 'deb'%}
{% set designate_central_packages = ['designate-central'] %} {% set designate_central_packages = ['designate-central'] %}
{% endif %} {% endif %}
{{ macros.install_packages(designate_central_packages | customizable("packages")) }} {{ macros.install_packages(designate_central_packages | customizable("packages")) }}

4
docker/designate/designate-mdns/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_mdns_packages = ['openstack-designate-mdns'] %} {% set designate_mdns_packages = ['openstack-designate-mdns'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set designate_mdns_packages = ['designate-mdns'] %} {% set designate_mdns_packages = ['designate-mdns'] %}
{% endif %} {% endif %}
{{ macros.install_packages(designate_mdns_packages | customizable("packages")) }} {{ macros.install_packages(designate_mdns_packages | customizable("packages")) }}

8
docker/designate/designate-pool-manager/Dockerfile.j2
View File

@ -7,23 +7,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
# The bind9 package here is only to provide the rndc binary. # The bind9 package here is only to provide the rndc binary.
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_pool_manager_packages = [ {% set designate_pool_manager_packages = [
'bind', 'bind',
'openstack-designate-pool-manager' 'openstack-designate-pool-manager'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set designate_pool_manager_packages = [ {% set designate_pool_manager_packages = [
'bind9', 'bind9',
'designate-pool-manager' 'designate-pool-manager'
] %} ] %}
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_pool_manager_packages = [ {% set designate_pool_manager_packages = [
'bind' 'bind'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set designate_pool_manager_packages = [ {% set designate_pool_manager_packages = [
'bind9' 'bind9'
] %} ] %}

4
docker/designate/designate-producer/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_producer_packages = ['openstack-designate-producer'] %} {% set designate_producer_packages = ['openstack-designate-producer'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set designate_producer_packages = ['designate-producer'] %} {% set designate_producer_packages = ['designate-producer'] %}
{% endif %} {% endif %}
{{ macros.install_packages(designate_producer_packages | customizable("packages")) }} {{ macros.install_packages(designate_producer_packages | customizable("packages")) }}

4
docker/designate/designate-sink/Dockerfile.j2
View File

@ -6,12 +6,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_sink_packages = [ {% set designate_sink_packages = [
'openstack-designate-sink', 'openstack-designate-sink',
'python-designateclient' 'python-designateclient'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set designate_sink_packages = [ {% set designate_sink_packages = [
'designate-sink', 'designate-sink',
'python-designateclient' 'python-designateclient'

8
docker/designate/designate-worker/Dockerfile.j2
View File

@ -7,23 +7,23 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
# The bind9 package here is only to provide the rndc binary. # The bind9 package here is only to provide the rndc binary.
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_worker_packages = [ {% set designate_worker_packages = [
'bind', 'bind',
'openstack-designate-worker' 'openstack-designate-worker'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set designate_worker_packages = [ {% set designate_worker_packages = [
'bind9', 'bind9',
'designate-worker' 'designate-worker'
] %} ] %}
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set designate_worker_packages = [ {% set designate_worker_packages = [
'bind' 'bind'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set designate_worker_packages = [ {% set designate_worker_packages = [
'bind9' 'bind9'
] %} ] %}

4
docker/dind/Dockerfile.j2
View File

@ -5,14 +5,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
# Since the gate cannot do DinD on centos due to the age of the kernel, we don't # Since the gate cannot do DinD on centos due to the age of the kernel, we don't
# build a true DinD image. Should the time come that we get a newer kernel in # build a true DinD image. Should the time come that we get a newer kernel in
# the centos gate and we want to do multinode we can populate this container # the centos gate and we want to do multinode we can populate this container
RUN /bin/true RUN /bin/true
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set dind_packages = [ {% set dind_packages = [
'btrfs-progs', 'btrfs-progs',
'openssh-server' 'openssh-server'

4
docker/dragonflow/dragonflow-base/Dockerfile.j2
View File

@ -14,12 +14,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set dragonflow_base_packages = [ {% set dragonflow_base_packages = [
'zeromq-devel' 'zeromq-devel'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set dragonflow_base_packages = [ {% set dragonflow_base_packages = [
'libzmq3-dev' 'libzmq3-dev'
] %} ] %}

4
docker/ec2-api/Dockerfile.j2
View File

@ -9,12 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ec2_api_packages = [ {% set ec2_api_packages = [
'openstack-ec2-api' 'openstack-ec2-api'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false

4
docker/elasticsearch/Dockerfile.j2
View File

@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='elasticsearch', shell='/bin/bash', homedir='/usr/share/elasticsearch') }} {{ macros.configure_user(name='elasticsearch', shell='/bin/bash', homedir='/usr/share/elasticsearch') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set elasticsearch_packages = [ {% set elasticsearch_packages = [
'elasticsearch', 'elasticsearch',
'java-1.8.0-openjdk-headless', 'java-1.8.0-openjdk-headless',
@ -15,7 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set elasticsearch_packages = [ {% set elasticsearch_packages = [
'default-jre-headless', 'default-jre-headless',
'elasticsearch', 'elasticsearch',

4
docker/etcd/Dockerfile.j2
View File

@ -7,9 +7,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='etcd') }} {{ macros.configure_user(name='etcd') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set etcd_packages = ['etcd'] %} {% set etcd_packages = ['etcd'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set etcd_packages = ['etcd'] %} {% set etcd_packages = ['etcd'] %}
{% endif %} {% endif %}
{{ macros.install_packages(etcd_packages | customizable("packages")) }} {{ macros.install_packages(etcd_packages | customizable("packages")) }}

14
docker/fluentd/Dockerfile.j2
View File

@ -5,7 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{{ macros.configure_user(name='fluentd', groups='mysql') }} {{ macros.configure_user(name='fluentd', groups='mysql') }}
# TODO:remove hostname package as it should be installed by the # TODO:remove hostname package as it should be installed by the
@ -26,7 +26,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'rubygem-fluent-plugin-secure-forward' 'rubygem-fluent-plugin-secure-forward'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{{ macros.configure_user(name='td-agent', groups='mysql') }} {{ macros.configure_user(name='td-agent', groups='mysql') }}
{% set fluentd_packages = [ {% set fluentd_packages = [
'g++', 'g++',
@ -41,12 +41,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(fluentd_packages | customizable("packages")) }} {{ macros.install_packages(fluentd_packages | customizable("packages")) }}
# Distro specific files and operations # Distro specific files and operations
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
COPY rpm_fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers COPY rpm_fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers
RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \
&& mkdir -p /var/run/fluentd \ && mkdir -p /var/run/fluentd \
&& chown -R fluentd: /etc/fluentd /var/run/fluentd && chown -R fluentd: /etc/fluentd /var/run/fluentd
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers COPY fluentd_sudoers /etc/sudoers.d/kolla_fluentd_sudoers
RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \ RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \
&& sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/init.d/td-agent \ && sed -i -e "s/USER=td-agent/USER=root/" -e "s/GROUP=td-agent/GROUP=root/" /etc/init.d/td-agent \
@ -60,7 +60,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
{% block fluentd_plugins_install %} {% block fluentd_plugins_install %}
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
{% set fluentd_plugins = [ {% set fluentd_plugins = [
'fluent-plugin-elasticsearch', 'fluent-plugin-elasticsearch',
'fluent-plugin-grep', 'fluent-plugin-grep',
@ -90,8 +90,8 @@ RUN tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \
{% block fluentd_footer %}{% endblock %} {% block fluentd_footer %}{% endblock %}
{% block footer %}{% endblock %} {% block footer %}{% endblock %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
USER fluentd USER fluentd
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
USER td-agent USER td-agent
{% endif %} {% endif %}

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

@ -12,7 +12,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set freezer_api_packages = [ {% set freezer_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -23,7 +23,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set freezer_api_packages = [ {% set freezer_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'

2
docker/glance/glance-api/Dockerfile.j2
View File

@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set glance_api_packages = ['qemu-img-ev'] %} {% set glance_api_packages = ['qemu-img-ev'] %}
{% elif base_distro == 'rhel' %} {% elif base_distro == 'rhel' %}
{% set glance_api_packages = ['qemu-img'] %} {% set glance_api_packages = ['qemu-img'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set glance_api_packages = ['qemu-utils'] %} {% set glance_api_packages = ['qemu-utils'] %}
{% endif %} {% endif %}

4
docker/glance/glance-base/Dockerfile.j2
View File

@ -8,14 +8,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='glance') }} {{ macros.configure_user(name='glance') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set glance_base_packages = [ {% set glance_base_packages = [
'openstack-glance', 'openstack-glance',
'python-oslo-vmware', 'python-oslo-vmware',
'python-rados', 'python-rados',
'python-rbd' 'python-rbd'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set glance_base_packages = [ {% set glance_base_packages = [
'glance', 'glance',
'python-os-brick', 'python-os-brick',

4
docker/gnocchi/gnocchi-api/Dockerfile.j2
View File

@ -6,12 +6,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set gnocchi_api_packages = [ {% set gnocchi_api_packages = [
'openstack-gnocchi-api', 'openstack-gnocchi-api',
'openstack-gnocchi-indexer-sqlalchemy' 'openstack-gnocchi-indexer-sqlalchemy'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set gnocchi_api_packages = ['gnocchi-api'] %} {% set gnocchi_api_packages = ['gnocchi-api'] %}
{% endif %} {% endif %}
{{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }} {{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }}

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

@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='gnocchi') }} {{ macros.configure_user(name='gnocchi') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'httpd', 'httpd',
@ -22,7 +22,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ 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 \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'apache2', 'apache2',
@ -45,7 +45,7 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'httpd', 'httpd',
@ -69,7 +69,7 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_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 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set gnocchi_base_packages = [ {% set gnocchi_base_packages = [
'apache2', 'apache2',

4
docker/gnocchi/gnocchi-metricd/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set gnocchi_metricd_packages = ['openstack-gnocchi-metricd'] %} {% set gnocchi_metricd_packages = ['openstack-gnocchi-metricd'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set gnocchi_metricd_packages = ['gnocchi-metricd'] %} {% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}
{% endif %} {% endif %}
{{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }} {{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }}

2
docker/gnocchi/gnocchi-statsd/Dockerfile.j2
View File

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set gnocchi_statsd_packages = ['openstack-gnocchi-statsd'] %} {% set gnocchi_statsd_packages = ['openstack-gnocchi-statsd'] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set gnocchi_statsd_packages = ['gnocchi-statsd'] %} {% set gnocchi_statsd_packages = ['gnocchi-statsd'] %}

2
docker/grafana/Dockerfile.j2
View File

@ -20,7 +20,7 @@ RUN echo 'There are no Grafana external repositories for {{ base_arch }}' \
'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.4-1.aarch64.rpm' 'https://s3-us-west-2.amazonaws.com/grafana-releases/release/grafana-5.2.4-1.aarch64.rpm'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set grafana_packages = [ {% set grafana_packages = [
'libfontconfig', 'libfontconfig',

2
docker/haproxy/Dockerfile.j2
View File

@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='haproxy') }} {{ macros.configure_user(name='haproxy') }}
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
{{ macros.debian_haproxy_existing_user_fix() }} {{ macros.debian_haproxy_existing_user_fix() }}
{% endif %} {% endif %}

4
docker/heat/heat-all/Dockerfile.j2
View File

@ -6,13 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set heat_all_packages = [ {% set heat_all_packages = [
'openstack-heat-api', 'openstack-heat-api',
'openstack-heat-engine', 'openstack-heat-engine',
'openstack-heat-monolith' 'openstack-heat-monolith'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN echo 'heat-all not yet available for {{ base_distro }}' && /bin/false RUN echo 'heat-all not yet available for {{ base_distro }}' && /bin/false
{% endif %} {% endif %}
{{ macros.install_packages(heat_all_packages | customizable("packages")) }} {{ macros.install_packages(heat_all_packages | customizable("packages")) }}

4
docker/heat/heat-api-cfn/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set heat_api_cfn_packages = ['openstack-heat-api-cfn'] %} {% set heat_api_cfn_packages = ['openstack-heat-api-cfn'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set heat_api_cfn_packages = ['heat-api-cfn'] %} {% set heat_api_cfn_packages = ['heat-api-cfn'] %}
{% endif %} {% endif %}
{{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }} {{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}

4
docker/heat/heat-api/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set heat_api_packages = ['openstack-heat-api'] %} {% set heat_api_packages = ['openstack-heat-api'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set heat_api_packages = ['heat-api'] %} {% set heat_api_packages = ['heat-api'] %}
{% endif %} {% endif %}
{{ macros.install_packages(heat_api_packages | customizable("packages")) }} {{ macros.install_packages(heat_api_packages | customizable("packages")) }}

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

@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set heat_base_packages = [ {% set heat_base_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ 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 \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set heat_base_packages = [ {% set heat_base_packages = [
'apache2', 'apache2',
'heat-common', 'heat-common',
@ -31,7 +31,7 @@ RUN echo > /etc/apache2/ports.conf
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set heat_base_packages = [ {% set heat_base_packages = [
'httpd', 'httpd',
@ -42,7 +42,7 @@ RUN echo > /etc/apache2/ports.conf
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set heat_base_packages = [ {% set heat_base_packages = [
'apache2', 'apache2',

4
docker/heat/heat-engine/Dockerfile.j2
View File

@ -6,13 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set heat_engine_packages = [ {% set heat_engine_packages = [
'python-barbicanclient', 'python-barbicanclient',
'python-zaqarclient', 'python-zaqarclient',
'openstack-heat-engine' 'openstack-heat-engine'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set heat_engine_packages = ['heat-engine'] %} {% set heat_engine_packages = ['heat-engine'] %}
{% endif %} {% endif %}
{{ macros.install_packages(heat_engine_packages | customizable("packages")) }} {{ macros.install_packages(heat_engine_packages | customizable("packages")) }}

4
docker/helm-repository/Dockerfile.j2
View File

@ -13,14 +13,14 @@ ENV helm_version=2.3.0 \
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set helm_repo_packages = [ {% set helm_repo_packages = [
'git', 'git',
'jq', 'jq',
'python2-pip' 'python2-pip'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set helm_repo_packages = [ {% set helm_repo_packages = [
'git', 'git',
'jq', 'jq',

8
docker/horizon/Dockerfile.j2
View File

@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='horizon') }} {{ macros.configure_user(name='horizon') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set horizon_packages = [ {% set horizon_packages = [
'gettext', 'gettext',
'httpd', 'httpd',
@ -48,7 +48,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
done done
{% endblock %} {% endblock %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set horizon_packages = [ {% set horizon_packages = [
'apache2', 'apache2',
'gettext', 'gettext',
@ -82,7 +82,7 @@ RUN echo > /etc/apache2/ports.conf \
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set horizon_packages = [ {% set horizon_packages = [
'gettext', 'gettext',
@ -98,7 +98,7 @@ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% endblock %} {% endblock %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set horizon_packages = [ {% set horizon_packages = [
'apache2', 'apache2',

6
docker/ironic-inspector/Dockerfile.j2
View File

@ -8,9 +8,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ironic-inspector') }} {{ macros.configure_user(name='ironic-inspector') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ironic_inspector_packages = ['openstack-ironic-inspector'] %} {% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ironic_inspector_packages = [ {% set ironic_inspector_packages = [
'iptables', 'iptables',
'ironic-inspector' 'ironic-inspector'
@ -20,7 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }} {{ macros.install_packages(ironic_inspector_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
{% set ironic_inspector_packages = ['iptables'] %} {% set ironic_inspector_packages = ['iptables'] %}
{% endif %} {% endif %}

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

@ -6,14 +6,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ironic_api_packages = [ {% set ironic_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
'mod_wsgi', 'mod_wsgi',
'openstack-ironic-api' 'openstack-ironic-api'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ironic_api_packages = [ {% set ironic_api_packages = [
'apache2', 'apache2',
'ironic-api', 'ironic-api',
@ -22,13 +22,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ironic_api_packages = [ {% set ironic_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
'mod_wsgi' 'mod_wsgi'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ironic_api_packages = [ {% set ironic_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'
@ -39,11 +39,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(ironic_api_packages | customizable("packages")) }} {{ macros.install_packages(ironic_api_packages | customizable("packages")) }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN echo > /etc/apache2/ports.conf RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}

4
docker/ironic/ironic-base/Dockerfile.j2
View File

@ -8,9 +8,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ironic') }} {{ macros.configure_user(name='ironic') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ironic_base_packages = ['openstack-ironic-common'] %} {% set ironic_base_packages = ['openstack-ironic-common'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ironic_base_packages = ['ironic-common'] %} {% set ironic_base_packages = ['ironic-common'] %}
{% endif %} {% endif %}

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

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
# TODO(Jeffrey4l): no python-oneviewclient # TODO(Jeffrey4l): no python-oneviewclient
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'ansible', 'ansible',
@ -40,7 +40,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'qemu-img' 'qemu-img'
] %} ] %}
{% endif %} {% endif %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
# TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk, # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
# ImcSdk package, python-sushy, ironic-staging-drivers # ImcSdk package, python-sushy, ironic-staging-drivers
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
@ -64,7 +64,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'dosfstools', 'dosfstools',
'e2fsprogs', 'e2fsprogs',
@ -78,7 +78,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'util-linux', 'util-linux',
'xfsprogs', 'xfsprogs',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'bsdmainutils', 'bsdmainutils',
'dosfstools', 'dosfstools',

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

@ -5,7 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ironic_pxe_packages = [ {% set ironic_pxe_packages = [
'httpd', 'httpd',
'ipxe-bootimgs', 'ipxe-bootimgs',
@ -31,7 +31,7 @@ ENV ironic_arch=aarch64
{{ 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 \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ironic_pxe_packages = [ {% set ironic_pxe_packages = [
'apache2', 'apache2',
'ipxe', 'ipxe',

4
docker/iscsid/Dockerfile.j2
View File

@ -5,14 +5,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set iscsid_packages = [ {% set iscsid_packages = [
'iscsi-initiator-utils', 'iscsi-initiator-utils',
'python-rtslib', 'python-rtslib',
'targetcli' 'targetcli'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set iscsid_packages = [ {% set iscsid_packages = [
'open-iscsi', 'open-iscsi',
'python-rtslib-fb', 'python-rtslib-fb',

4
docker/kafka/Dockerfile.j2
View File

@ -7,11 +7,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='kafka', homedir='/opt/kafka') }} {{ macros.configure_user(name='kafka', homedir='/opt/kafka') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set kafka_packages = [ {% set kafka_packages = [
'java-1.8.0-openjdk-headless', 'java-1.8.0-openjdk-headless',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set kafka_packages = [ {% set kafka_packages = [
'default-jre-headless', 'default-jre-headless',
] %} ] %}

4
docker/keepalived/Dockerfile.j2
View File

@ -5,12 +5,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set keepalived_packages = [ {% set keepalived_packages = [
'hostname', 'hostname',
'keepalived' 'keepalived'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set keepalived_packages = [ {% set keepalived_packages = [
'keepalived' 'keepalived'
] %} ] %}

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

@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='keystone') }} {{ macros.configure_user(name='keystone') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'httpd', 'httpd',
'mod_auth_mellon', 'mod_auth_mellon',
@ -27,7 +27,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'apache2', 'apache2',
'keystone', 'keystone',
@ -46,7 +46,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'httpd', 'httpd',
'mod_auth_mellon', 'mod_auth_mellon',
@ -59,7 +59,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set keystone_base_packages = [ {% set keystone_base_packages = [
'apache2', 'apache2',
'libapache2-mod-auth-mellon', 'libapache2-mod-auth-mellon',

4
docker/keystone/keystone-fernet/Dockerfile.j2
View File

@ -5,13 +5,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set keystone_fernet_packages = [ {% set keystone_fernet_packages = [
'cronie', 'cronie',
'openssh-clients', 'openssh-clients',
'rsync' 'rsync'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set keystone_fernet_packages = [ {% set keystone_fernet_packages = [
'cron', 'cron',
'openssh-client', 'openssh-client',

4
docker/keystone/keystone-ssh/Dockerfile.j2
View File

@ -7,12 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='keystone', shell='/bin/bash') }} {{ macros.configure_user(name='keystone', shell='/bin/bash') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set keystone_ssh_packages = [ {% set keystone_ssh_packages = [
'openssh-server', 'openssh-server',
'rsync' 'rsync'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set keystone_ssh_packages = [ {% set keystone_ssh_packages = [
'openssh-server', 'openssh-server',
'rsync' 'rsync'

8
docker/keystone/keystone/Dockerfile.j2
View File

@ -11,12 +11,12 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
# TODO: oraclelinux fails to install these packages. Should be added when this is fixed. # TODO: oraclelinux fails to install these packages. Should be added when this is fixed.
{% if base_distro in ['centos', 'rhel'] %} {% if base_package_type == 'rpm' and base_distro != 'oraclelinux' %}
{% set keystone_packages = [ {% set keystone_packages = [
'mod_auth_gssapi', 'mod_auth_gssapi',
'python-requests-kerberos', 'python-requests-kerberos',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set keystone_packages = [ {% set keystone_packages = [
'libapache2-mod-auth-gssapi', 'libapache2-mod-auth-gssapi',
'python-requests-kerberos', 'python-requests-kerberos',
@ -24,11 +24,11 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_keystone_bo
{% endif %} {% endif %}
{{ macros.install_packages(keystone_packages | customizable("packages")) }} {{ macros.install_packages(keystone_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'rhel'] %} {% if base_package_type == 'rpm' and base_distro != 'oraclelinux' %}
{% set keystone_packages = [ {% set keystone_packages = [
'mod_auth_gssapi', 'mod_auth_gssapi',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set keystone_packages = [ {% set keystone_packages = [
'libapache2-mod-auth-gssapi', 'libapache2-mod-auth-gssapi',
] %} ] %}

4
docker/kolla-toolbox/Dockerfile.j2
View File

@ -10,7 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='ansible') }} {{ macros.configure_user(name='ansible') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set kolla_toolbox_packages = [ {% set kolla_toolbox_packages = [
'crudini', 'crudini',
'gcc', 'gcc',
@ -28,7 +28,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'python-devel' 'python-devel'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set kolla_toolbox_packages = [ {% set kolla_toolbox_packages = [
'build-essential', 'build-essential',
'ca-certificates', 'ca-certificates',

4
docker/kube/kube-controller-manager/Dockerfile.j2
View File

@ -7,11 +7,11 @@ ENV KUBERNETES_COMPONENT=kube-controller-manager
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set ceph_support_packages = [ {% set ceph_support_packages = [
'ceph-common' 'ceph-common'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set ceph_support_packages = [ {% set ceph_support_packages = [
'ceph-common' 'ceph-common'
] %} ] %}

4
docker/kuryr/kuryr-libnetwork/Dockerfile.j2
View File

@ -11,14 +11,14 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set kuryr_libnetwork_packages = [ {% set kuryr_libnetwork_packages = [
'bridge-utils', 'bridge-utils',
'openvswitch' 'openvswitch'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set kuryr_libnetwork_packages = [ {% set kuryr_libnetwork_packages = [
'bridge-utils', 'bridge-utils',

8
docker/logstash/Dockerfile.j2
View File

@ -7,14 +7,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='logstash', shell='/bin/bash', homedir='/usr/share/logstash') }} {{ macros.configure_user(name='logstash', shell='/bin/bash', homedir='/usr/share/logstash') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set logstash_packages = [ {% set logstash_packages = [
'java-1.8.0-openjdk-headless' 'java-1.8.0-openjdk-headless'
] %} ] %}
ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set logstash_packages = [ {% set logstash_packages = [
'openjdk-8-jre-headless', 'openjdk-8-jre-headless',
'logrotate' 'logrotate'
@ -40,7 +40,7 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
# work with Logstash 5.x or above. When Monasca is updated to use a more # work with Logstash 5.x or above. When Monasca is updated to use a more
# recent messaging version this patch should be reverted and the Monasca # recent messaging version this patch should be reverted and the Monasca
# Logstash configuration files upgraded to use the new format. # Logstash configuration files upgraded to use the new format.
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
ENV logstash_rpm_url=https://download.elastic.co/logstash/logstash/packages/centos/logstash-2.4.1.noarch.rpm ENV logstash_rpm_url=https://download.elastic.co/logstash/logstash/packages/centos/logstash-2.4.1.noarch.rpm
ENV logstash_rpm_sha1sum=68c5e78c3d941f06f77d638c0756b6aea715bec5 ENV logstash_rpm_sha1sum=68c5e78c3d941f06f77d638c0756b6aea715bec5
@ -49,7 +49,7 @@ RUN curl -sSL -o /tmp/logstash.rpm ${logstash_rpm_url} \
&& yum -y install /tmp/logstash.rpm \ && yum -y install /tmp/logstash.rpm \
&& rm -f /tmp/logstash.rpm && rm -f /tmp/logstash.rpm
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
ENV logstash_deb_url=https://download.elastic.co/logstash/logstash/packages/debian/logstash-2.4.1_all.deb ENV logstash_deb_url=https://download.elastic.co/logstash/logstash/packages/debian/logstash-2.4.1_all.deb
ENV logstash_deb_sha1sum=7ba3b174a3ef48a7d0945d9b5c7f12c5005abb47 ENV logstash_deb_sha1sum=7ba3b174a3ef48a7d0945d9b5c7f12c5005abb47

4
docker/magnum/magnum-api/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set magnum_api_packages = ['openstack-magnum-api'] %} {% set magnum_api_packages = ['openstack-magnum-api'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set magnum_api_packages = ['magnum-api'] %} {% set magnum_api_packages = ['magnum-api'] %}
{% endif %} {% endif %}
{{ macros.install_packages(magnum_api_packages | customizable("packages")) }} {{ macros.install_packages(magnum_api_packages | customizable("packages")) }}

4
docker/magnum/magnum-base/Dockerfile.j2
View File

@ -8,9 +8,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='magnum') }} {{ macros.configure_user(name='magnum') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux'] %} {% if base_package_type == 'rpm' %}
{% set magnum_base_packages = ['openstack-magnum-common'] %} {% set magnum_base_packages = ['openstack-magnum-common'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set magnum_base_packages = ['magnum-common'] %} {% set magnum_base_packages = ['magnum-common'] %}
{% endif %} {% endif %}
{{ macros.install_packages(magnum_base_packages | customizable("packages")) }} {{ macros.install_packages(magnum_base_packages | customizable("packages")) }}

4
docker/magnum/magnum-conductor/Dockerfile.j2
View File

@ -6,12 +6,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set magnum_conductor_packages = [ {% set magnum_conductor_packages = [
'openstack-magnum-conductor' 'openstack-magnum-conductor'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set magnum_conductor_packages = [ {% set magnum_conductor_packages = [
'magnum-conductor' 'magnum-conductor'
] %} ] %}

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

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set manila_api_packages = [ {% set manila_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -18,7 +18,7 @@ RUN mkdir -p /var/www/cgi-bin/manila \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ && 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set manila_api_packages = [ {% set manila_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi', 'libapache2-mod-wsgi',
@ -33,7 +33,7 @@ RUN mkdir -p /var/www/cgi-bin/manila \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set manila_api_packages = [ {% set manila_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -43,7 +43,7 @@ RUN mkdir -p /var/www/cgi-bin/manila \
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set manila_api_packages = [ {% set manila_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'

8
docker/manila/manila-base/Dockerfile.j2
View File

@ -8,14 +8,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='manila') }} {{ macros.configure_user(name='manila') }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set manila_base_packages = [ {% set manila_base_packages = [
'openstack-manila', 'openstack-manila',
'openvswitch' 'openvswitch'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set manila_base_packages = [ {% set manila_base_packages = [
'manila-common', 'manila-common',
@ -27,11 +27,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(manila_base_packages | customizable("packages")) }} {{ macros.install_packages(manila_base_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set manila_base_packages = ['openvswitch'] %} {% set manila_base_packages = ['openvswitch'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set manila_base_packages = ['openvswitch-switch'] %} {% set manila_base_packages = ['openvswitch-switch'] %}

6
docker/manila/manila-data/Dockerfile.j2
View File

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
{% set manila_data_packages = [ {% set manila_data_packages = [
'manila-data' 'manila-data'
@ -15,13 +15,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set manila_data_packages = [ {% set manila_data_packages = [
'nfs-utils' 'nfs-utils'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set manila_data_packages = [ {% set manila_data_packages = [
'nfs-common' 'nfs-common'

2
docker/manila/manila-scheduler/Dockerfile.j2
View File

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
{% set manila_scheduler_packages = [ {% set manila_scheduler_packages = [
'manila-scheduler' 'manila-scheduler'

8
docker/manila/manila-share/Dockerfile.j2
View File

@ -6,13 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set manila_share_packages = [ {% set manila_share_packages = [
'openstack-manila-share', 'openstack-manila-share',
'ceph-common' 'ceph-common'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set manila_share_packages = [ {% set manila_share_packages = [
'manila-share', 'manila-share',
'ceph-common' 'ceph-common'
@ -23,11 +23,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(manila_share_packages | customizable("packages")) }} {{ macros.install_packages(manila_share_packages | customizable("packages")) }}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set manila_share_packages = [ {% set manila_share_packages = [
'ceph-common' 'ceph-common'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set manila_share_packages = [ {% set manila_share_packages = [
'ceph-common' 'ceph-common'
] %} ] %}

6
docker/mariadb/Dockerfile.j2
View File

@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='mysql') }} {{ macros.configure_user(name='mysql') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set mariadb_packages = [ {% set mariadb_packages = [
'expect', 'expect',
'galera', 'galera',
@ -20,7 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'tar' 'tar'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set mariadb_packages = [ {% set mariadb_packages = [
'expect' 'expect'
] %} ] %}
@ -47,7 +47,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start \
&& chmod 440 /etc/sudoers.d/kolla_mariadb_sudoers \ && chmod 440 /etc/sudoers.d/kolla_mariadb_sudoers \
&& rm -rf /var/lib/mysql/* && rm -rf /var/lib/mysql/*
{% if base_distro in ['debian', 'ubuntu'] %} {% if base_package_type == 'deb' %}
RUN mkdir -p /var/run/mysqld && chown mysql /var/run/mysqld && chmod 755 /var/run/mysqld RUN mkdir -p /var/run/mysqld && chown mysql /var/run/mysqld && chmod 755 /var/run/mysqld
{% endif %} {% endif %}
{% block mariadb_footer %}{% endblock %} {% block mariadb_footer %}{% endblock %}

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

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set mistral_api_packages = [ {% set mistral_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set mistral_api_packages = [ {% set mistral_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi', 'libapache2-mod-wsgi',
@ -28,7 +28,7 @@ RUN echo > /etc/apache2/ports.conf
{% endif %} {% endif %}
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set mistral_api_packages = [ {% set mistral_api_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -38,7 +38,7 @@ RUN echo > /etc/apache2/ports.conf
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set mistral_api_packages = [ {% set mistral_api_packages = [
'apache2', 'apache2',
'libapache2-mod-wsgi' 'libapache2-mod-wsgi'

4
docker/mistral/mistral-base/Dockerfile.j2
View File

@ -9,14 +9,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set mistral_base_packages = [ {% set mistral_base_packages = [
'openstack-mistral-common', 'openstack-mistral-common',
'openstack-tacker', 'openstack-tacker',
'redis', 'redis',
] %} ] %}
# Note(egonzalez): Ubuntu does not have tacker packages yet. # Note(egonzalez): Ubuntu does not have tacker packages yet.
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set mistral_base_packages = [ {% set mistral_base_packages = [
'mistral-common', 'mistral-common',
'redis-server' 'redis-server'

4
docker/mistral/mistral-engine/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set mistral_engine_packages = ['openstack-mistral-engine'] %} {% set mistral_engine_packages = ['openstack-mistral-engine'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set mistral_engine_packages = ['mistral-engine'] %} {% set mistral_engine_packages = ['mistral-engine'] %}
{% endif %} {% endif %}
{{ macros.install_packages(mistral_engine_packages | customizable("packages")) }} {{ macros.install_packages(mistral_engine_packages | customizable("packages")) }}

4
docker/mistral/mistral-event-engine/Dockerfile.j2
View File

@ -6,10 +6,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set mistral_event_engine_packages = ['openstack-mistral-event-engine'] %} {% set mistral_event_engine_packages = ['openstack-mistral-event-engine'] %}
{{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }} {{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false && /bin/false
{% endif %} {% endif %}

4
docker/mistral/mistral-executor/Dockerfile.j2
View File

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set mistral_executor_packages = ['openstack-mistral-executor'] %} {% set mistral_executor_packages = ['openstack-mistral-executor'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set mistral_executor_packages = ['mistral-executor'] %} {% set mistral_executor_packages = ['mistral-executor'] %}
{% endif %} {% endif %}
{{ macros.install_packages(mistral_executor_packages | customizable("packages")) }} {{ macros.install_packages(mistral_executor_packages | customizable("packages")) }}

4
docker/monasca/monasca-api/Dockerfile.j2
View File

@ -12,11 +12,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set monasca_api_packages = [ {% set monasca_api_packages = [
'mariadb', 'mariadb',
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set monasca_api_packages = [ {% set monasca_api_packages = [
'mariadb-client', 'mariadb-client',
] %} ] %}

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

@ -14,7 +14,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set monasca_base_packages = [ {% set monasca_base_packages = [
'httpd', 'httpd',
'mod_ssl', 'mod_ssl',
@ -24,7 +24,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{{ macros.install_packages(monasca_base_packages | customizable("packages")) }} {{ macros.install_packages(monasca_base_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ 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 && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set monasca_base_packages = [ {% set monasca_base_packages = [
'apache2', 'apache2',

8
docker/monasca/monasca-grafana/Dockerfile.j2
View File

@ -7,7 +7,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='monasca', homedir='/usr/share/grafana') }} {{ macros.configure_user(name='monasca', homedir='/usr/share/grafana') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set monasca_grafana_build_packages = [ {% set monasca_grafana_build_packages = [
'golang', 'golang',
'git', 'git',
@ -20,7 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'fontconfig', 'fontconfig',
'rpm-build' 'rpm-build'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set monasca_grafana_build_packages = [ {% set monasca_grafana_build_packages = [
'golang', 'golang',
'git', 'git',
@ -60,9 +60,9 @@ RUN gem install fpm \
&& mv ${monasca_grafana_build_path}/dist /grafana_pkgs \ && mv ${monasca_grafana_build_path}/dist /grafana_pkgs \
&& rm -rf /grafana && rm -rf /grafana
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set monasca_grafana_packages = ['/grafana_pkgs/grafana*.rpm'] %} {% set monasca_grafana_packages = ['/grafana_pkgs/grafana*.rpm'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set monasca_grafana_packages = ['/grafana_pkgs/grafana*.deb'] %} {% set monasca_grafana_packages = ['/grafana_pkgs/grafana*.deb'] %}
{% endif %} {% endif %}

4
docker/monasca/monasca-thresh/Dockerfile.j2
View File

@ -16,14 +16,14 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %} {% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set monasca_thresh_packages = [ {% set monasca_thresh_packages = [
'maven', 'maven',
] %} ] %}
ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/ ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set monasca_thresh_packages = [ {% set monasca_thresh_packages = [
'openjdk-8-jdk-headless', 'openjdk-8-jdk-headless',
'maven', 'maven',

4
docker/mongodb/Dockerfile.j2
View File

@ -7,12 +7,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='mongodb') }} {{ macros.configure_user(name='mongodb') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set mongodb_packages = [ {% set mongodb_packages = [
'mongodb', 'mongodb',
'mongodb-server' 'mongodb-server'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set mongodb_packages = [ {% set mongodb_packages = [
'mongodb-server' 'mongodb-server'
] %} ] %}

4
docker/multipathd/Dockerfile.j2
View File

@ -5,9 +5,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
{% set multipathd_packages = ['device-mapper-multipath'] %} {% set multipathd_packages = ['device-mapper-multipath'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
{% set multipathd_packages = ['multipath-tools'] %} {% set multipathd_packages = ['multipath-tools'] %}
{% endif %} {% endif %}

4
docker/murano/murano-api/Dockerfile.j2
View File

@ -6,11 +6,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_package_type == 'rpm' %}
RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip \ RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip \
&& ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip && ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip
{% set murano_api_packages = ['openstack-murano-api'] %} {% set murano_api_packages = ['openstack-murano-api'] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_package_type == 'deb' %}
RUN ln -s /usr/share/murano-common/io.murano.zip /io.murano.zip \ RUN ln -s /usr/share/murano-common/io.murano.zip /io.murano.zip \
&& ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip && ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip
{% set murano_api_packages = ['murano-api'] %} {% set murano_api_packages = ['murano-api'] %}

Some files were not shown because too many files have changed in this diff Show More