openstack/kolla
Code Issues Proposed changes

debian: enable all images enabled for Ubuntu

Browse Source 
Debian support is not maintained in Kolla so it got a bit behind Ubuntu
one. This changeset enables Debian for all images. Jessie (even with
backports) may be too old for some images though.

Also unify distro check to ['debian', 'ubuntu'] to keep alphabetical order
like it is done for RPM distributions.

Partially-Implements: blueprint multiarch-and-arm64-containers

Change-Id: I056233fbfa277e0e2360c07c3f80d9558c554357
This commit is contained in:
Marcin Juszkiewicz 2017-02-12 18:36:51 +01:00
parent 0b6b2c40dd
commit 69fef5cd59
143 changed files with 192 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_api_packages = ['openstack-aodh-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set aodh_api_packages = ['aodh-api'] %}
{% endif %}
{{ macros.install_packages(aodh_api_packages | customizable("packages")) }}

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

@ -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/ \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set aodh_base_packages = [
'aodh-common',
@ -52,7 +52,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
RUN mkdir -p /var/www/cgi-bin/aodh \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set aodh_base_packages = [
'apache2',

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_evaluator_packages = ['openstack-aodh-evaluator'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set aodh_evaluator_packages = ['aodh-evaluator'] %}
{% endif %}
{{ macros.install_packages(aodh_evaluator_packages | customizable("packages")) }}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_expirer_packages = ['openstack-aodh-expirer'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set aodh_expirer_packages = ['aodh-expirer'] %}
{% endif %}
{{ macros.install_packages(aodh_expirer_packages | customizable("packages")) }}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_listener_packages = ['openstack-aodh-listener'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set aodh_listener_packages = ['aodh-listener'] %}
{% endif %}
{{ macros.install_packages(aodh_listener_packages | customizable("packages")) }}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set aodh_notifier_packages = ['openstack-aodh-notifier'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set aodh_notifier_packages = ['aodh-notifier'] %}
{% endif %}
{{ macros.install_packages(aodh_notifier_packages | customizable("packages")) }}

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

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
'openstack-barbican-api',
'uwsgi-plugin-python'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set barbican_api_packages = [
'barbican-api',
'uwsgi-plugin-python'

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_base_packages = ['openstack-barbican-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set barbican_base_packages = ['barbican-common'] %}
{% endif %}
@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set barbican_base_packages = ['uwsgi-plugin-python'] %}
{% endif %}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_keystone_listener_packages = ['openstack-barbican-keystone-listener'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %}
{% endif %}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set barbican_worker_packages = ['openstack-barbican-worker'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set barbican_worker_packages = ['barbican-worker'] %}
{% endif %}

2
docker/base/Dockerfile.j2
View File

@ -201,7 +201,7 @@ RUN yum -y install \
{% endif %}
{# endif for install type is source for RPM based distros #}
{# endif for base_distro centos,oraclelinux,rhel #}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
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

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

@ -26,7 +26,7 @@ RUN ln -s bifrost-base-source/* bifrost \
WORKDIR /bifrost
{% if base_distro in ['ubuntu', 'debian'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
RUN sed -e "s/.*mariadb.*//Ig" -i /etc/apt/sources.list && apt-get purge -y mariadb* mysql*
{% endif %}
@ -34,7 +34,7 @@ RUN sed -e "s/.*mariadb.*//Ig" -i /etc/apt/sources.list && apt-get purge -y mari
RUN bash -c './scripts/env-setup.sh && source ./env-vars && \
ansible-playbook -vvvv -i /bifrost/playbooks/inventory/target /bifrost/playbooks/install.yaml \
-e @/tmp/build_arg.yml && \
{% if base_distro in ['ubuntu', 'debian'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
apt-get clean'
{% else %}
yum clean all'

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

@ -16,7 +16,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(ceilometer_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceilometer_api_packages = [
'apache2',
'ceilometer-api',
@ -45,7 +45,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
{% endblock %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceilometer_api_packages = [
'apache2',

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

@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }}
'python-tooz',
'python-wsme'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceilometer_base_packages = [
'ceilometer-common',
'python-gnocchiclient',

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_central_packages = ['openstack-ceilometer-central'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceilometer_central_packages = ['ceilometer-agent-central'] %}
{% endif %}

2
docker/ceilometer/ceilometer-collector/Dockerfile.j2
View File

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_collector_packages = ['openstack-ceilometer-collector'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceilometer_collector_packages = ['ceilometer-collector'] %}
{% endif %}

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

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
'openstack-ceilometer-compute',
'python-ceilometerclient'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceilometer_compute_packages = [
'ceilometer-agent-compute',
'python-ceilometerclient',
@ -25,7 +25,7 @@ MAINTAINER {{ maintainer }}
{% set ceilometer_compute_packages = [
'libvirt-devel'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceilometer_compute_packages = [
'libvirt-dev'
] %}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ceilometer_notification_packages = ['openstack-ceilometer-notification'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceilometer_notification_packages = ['ceilometer-agent-notification'] %}
{% endif %}

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

@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
'parted',
'xfsprogs'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceph_base_packages = [
'btrfs-tools',
'ceph',

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

@ -16,7 +16,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set cinder_api_packages = [
'apache2',
'cinder-api',
@ -36,7 +36,7 @@ RUN echo > /etc/apache2/ports.conf
{{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set cinder_api_packages = [
'apache2',
'libapache2-mod-wsgi'

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% set cinder_backup_packages = [
'nfs-utils'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set cinder_backup_packages = [
'cinder-backup',
'nfs-common'
@ -22,7 +22,7 @@ MAINTAINER {{ maintainer }}
{% set cinder_backup_packages = [
'nfs-utils'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set cinder_backup_packages = [
'nfs-common'
] %}

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

@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }}
'openstack-cinder',
'python-automaton'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set cinder_base_packages = [
'ceph-common',
'cinder-common',
@ -31,7 +31,7 @@ MAINTAINER {{ maintainer }}
'lvm2',
'qemu-img'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set cinder_base_packages = [
'ceph-common',
'lvm2',

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

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

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

@ -16,7 +16,7 @@ MAINTAINER {{ maintainer }}
RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
{% endblock %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set cinder_volume_packages = [
'nfs-common',
'tgt'
@ -30,7 +30,7 @@ RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/targets.conf
{% endif %}
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu', 'debian'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% set cinder_volume_packages = [
'cinder-volume'
] %}

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

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
'openstack-cloudkitty-api',
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false

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

@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
'openstack-cloudkitty-common',
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false

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

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
'openstack-cloudkitty-processor',
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{{ macros.configure_user(name='congress') }}
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% set congress_base_packages = [
'congress-common',
'congress-server']

2
docker/cron/Dockerfile.j2
View File

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
'cronie',
'logrotate'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set cron_packages = [
'cron',
'logrotate'

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set designate_api_packages = ['openstack-designate-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set designate_api_packages = ['designate-api'] %}
{% endif %}
{{ macros.install_packages(designate_api_packages | customizable("packages")) }}

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

@ -10,14 +10,14 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set designate_backend_bind9_packages = ['bind9'] %}
{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
{% endif %}
{% set designate_backend_bind_name = 'bind' if base_distro in ['ubuntu', 'debian'] else 'named' %}
{% set designate_backend_bind_name = 'bind' if base_distro in ['debian', 'ubuntu'] else 'named' %}
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 }} \

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

@ -28,7 +28,7 @@ RUN cp /etc/designate/policy.json /tmp/ \
&& mv /tmp/policy.json /etc/designate/ \
&& chown designate: /etc/designate/policy.json
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set designate_base_packages = [
'designate-common',
'python-tooz'

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set designate_central_packages = ['openstack-designate-central'] %}
{% elif base_distro in ['ubuntu']%}
{% elif base_distro in ['debian', 'ubuntu']%}
{% set designate_central_packages = ['designate-central'] %}
{% endif %}
{{ macros.install_packages(designate_central_packages | customizable("packages")) }}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set designate_mdns_packages = ['openstack-designate-mdns'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set designate_mdns_packages = ['designate-mdns'] %}
{% endif %}
{{ macros.install_packages(designate_mdns_packages | customizable("packages")) }}

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

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
'bind',
'openstack-designate-pool-manager'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set designate_pool_manager_packages = [
'bind9',
'designate-pool-manager'
@ -23,7 +23,7 @@ MAINTAINER {{ maintainer }}
{% set designate_pool_manager_packages = [
'bind'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set designate_pool_manager_packages = [
'bind9'
] %}

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

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
'openstack-designate-sink',
'python-designateclient'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set designate_sink_packages = [
'designate-sink',
'python-designateclient'

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

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
'bind',
'openstack-designate-worker'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set designate_worker_packages = [
'bind9',
'designate-worker'
@ -23,7 +23,7 @@ MAINTAINER {{ maintainer }}
{% set designate_worker_packages = [
'bind'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set designate_worker_packages = [
'bind9'
] %}

2
docker/dind/Dockerfile.j2
View File

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
# the centos gate and we want to do multinode we can populate this container
RUN /bin/true
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set dind_packages = [
'btrfs-tools',
'docker-engine',

2
docker/elasticsearch/Dockerfile.j2
View File

@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }}
ENV JAVA_HOME /usr/lib/jvm/jre-1.7.0-openjdk/
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set elasticsearch_packages = [
'elasticsearch',
'openjdk-8-jre'

2
docker/etcd/Dockerfile.j2
View File

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set etcd_packages = ['etcd'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set etcd_packages = ['etcd'] %}
{% endif %}
{{ macros.install_packages(etcd_packages | customizable("packages")) }}

2
docker/fluentd/Dockerfile.j2
View File

@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }}
'td-agent'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set fluentd_packages = [
'g++',

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

@ -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 \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set freezer_api_packages = [
'apache2',
'libapache2-mod-wsgi'

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

@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set glance_api_packages = ['qemu-img'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set glance_api_packages = ['qemu-utils'] %}
{% endif %}

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

@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
'python-rados',
'python-rbd'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set glance_base_packages = [
'glance',
'python-rados',

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

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
'openstack-gnocchi-api',
'openstack-gnocchi-indexer-sqlalchemy'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set gnocchi_api_packages = ['gnocchi-api'] %}
{% endif %}
{{ macros.install_packages(gnocchi_api_packages | customizable("packages")) }}

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

@ -22,7 +22,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(gnocchi_base_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set gnocchi_base_packages = [
'apache2',
@ -50,7 +50,7 @@ RUN truncate -s 0 /etc/apache2/ports.conf
RUN mkdir -p /var/www/cgi-bin/gnocchi \
&& sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set gnocchi_base_packages = [
'apache2',

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set gnocchi_metricd_packages = ['openstack-gnocchi-metricd'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set gnocchi_metricd_packages = ['gnocchi-metricd'] %}
{% endif %}
{{ macros.install_packages(gnocchi_metricd_packages | customizable("packages")) }}

2
docker/haproxy/Dockerfile.j2
View File

@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{{ macros.configure_user(name='haproxy') }}
{% if base_distro in ['ubuntu', 'debian'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
{{ macros.debian_haproxy_existing_user_fix() }}
{% endif %}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set heat_api_cfn_packages = ['openstack-heat-api-cfn'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set heat_api_cfn_packages = ['heat-api-cfn'] %}
{% endif %}
{{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set heat_api_packages = ['openstack-heat-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set heat_api_packages = ['heat-api'] %}
{% endif %}
{{ macros.install_packages(heat_api_packages | customizable("packages")) }}

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

@ -19,7 +19,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(heat_base_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set heat_base_packages = [
'apache2',
'heat-common',
@ -42,7 +42,7 @@ RUN echo > /etc/apache2/ports.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
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set heat_base_packages = [
'apache2',

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

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
'python-zaqarclient',
'openstack-heat-engine'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set heat_engine_packages = ['heat-engine'] %}
{% endif %}
{{ macros.install_packages(heat_engine_packages | customizable("packages")) }}

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

@ -20,7 +20,7 @@ ENV helm_version=2.1.3 \
'python-pip'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set helm_repo_packages = [
'git',
'jq',

4
docker/horizon/Dockerfile.j2
View File

@ -44,7 +44,7 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& (cd /usr/lib/python2.7/site-packages/openstack_dashboard && /usr/bin/python /usr/bin/manage.py compilemessages)
{% endblock %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set horizon_packages = [
'apache2',
@ -94,7 +94,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
{% endblock %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set horizon_packages = [
'apache2',

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_api_packages = ['openstack-ironic-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ironic_api_packages = ['ironic-api'] %}
{% endif %}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_base_packages = ['openstack-ironic-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ironic_base_packages = ['ironic-common'] %}
{% endif %}

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

@ -29,7 +29,7 @@ MAINTAINER {{ maintainer }}
'socat',
'util-linux'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
# TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
# pyremotevbox, ImcSdk package
{% set ironic_conductor_packages = [
@ -66,7 +66,7 @@ MAINTAINER {{ maintainer }}
'socat',
'util-linux'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ironic_conductor_packages = [
'bsdmainutils',
'dosfstools',

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set ironic_inspector_packages = ['openstack-ironic-inspector'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ironic_inspector_packages = [
'iptables',
'ironic-inspector'
@ -20,7 +20,7 @@ MAINTAINER {{ maintainer }}
COPY ironic_sudoers_binary /etc/sudoers.d/kolla_ironic_inspector_sudoers
{% elif install_type == 'source' %}
{% if base_distro in ['ubuntu'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% set ironic_inspector_packages = ['iptables'] %}
{% endif %}

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

@ -17,7 +17,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(ironic_pxe_packages | customizable("packages")) }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ironic_pxe_packages = [
'apache2',
'ipxe',

2
docker/iscsid/Dockerfile.j2
View File

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
'targetcli'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set iscsid_packages = [
'open-iscsi',
'python-rtslib',

2
docker/kafka/Dockerfile.j2
View File

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set kafka_packages = [
'default-jre',
] %}

2
docker/keepalived/Dockerfile.j2
View File

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
'keepalived',
'socat'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set keepalived_packages = [
'keepalived',
'socat'

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

@ -25,7 +25,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 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set keystone_base_packages = [
'apache2',
'keystone',
@ -38,7 +38,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
&& cp -a /usr/bin/keystone-wsgi-public /var/www/cgi-bin/keystone/main \
&& cp -a /usr/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \
&& echo > /etc/apache2/ports.conf \
&& rm /etc/apache2/sites-enabled/keystone.conf
&& rm -f /etc/apache2/sites-enabled/keystone.conf
{% endif %}
{% elif install_type == 'source' %}
@ -53,7 +53,7 @@ RUN mkdir -p /var/www/cgi-bin/keystone \
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set keystone_base_packages = [
'apache2',
'libapache2-mod-wsgi',

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

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
'openssh-clients',
'rsync'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set keystone_fernet_packages = [
'cron',
'openssh-client',

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

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
'openssh-server',
'rsync'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set keystone_ssh_packages = [
'openssh-server',
'rsync'

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

@ -27,7 +27,7 @@ MAINTAINER {{ maintainer }}
'python-devel'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set kolla_toolbox_packages = [
'build-essential',
'ca-certificates',

2
docker/kube/kube-controller-manager-amd64/Dockerfile.j2
View File

@ -11,7 +11,7 @@ ENV KUBERNETES_COMPONENT=kube-controller-manager
{% set ceph_support_packages = [
'ceph-common'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceph_support_packages = [
'ceph-common'
] %}

2
docker/macros.j2
View File

@ -2,7 +2,7 @@
{% if packages is defined and packages|length > 0 -%}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] -%}
RUN yum --setopt skip_missing_names_on_install=False -y install {{ packages | join(' ') }} && yum clean all
{%- elif base_distro in ['ubuntu', 'debian'] -%}
{%- elif base_distro in ['debian', 'ubuntu'] -%}
{#-
debian_package_install is a utility method to build up an appropriate
set of commands to install packages in a debian-based environment that

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set magnum_api_packages = ['openstack-magnum-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set magnum_api_packages = ['magnum-api'] %}
{% endif %}
{{ macros.install_packages(magnum_api_packages | customizable("packages")) }}

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

@ -10,7 +10,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux'] %}
{% set magnum_base_packages = ['openstack-magnum-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set magnum_base_packages = ['magnum-common'] %}
{% endif %}
{{ macros.install_packages(magnum_base_packages | customizable("packages")) }}

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

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
'openstack-magnum-conductor'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set magnum_conductor_packages = [
'magnum-conductor'
] %}

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

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% set manila_api_packages = [
'manila-api'

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

@ -15,7 +15,7 @@ MAINTAINER {{ maintainer }}
'openvswitch'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set manila_base_packages = [
'manila-common',
@ -31,7 +31,7 @@ MAINTAINER {{ maintainer }}
{% set manila_base_packages = ['openvswitch'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set manila_base_packages = ['openvswitch-switch'] %}

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

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set manila_data_packages = [
'manila-data'
@ -26,7 +26,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
'nfs-utils'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set manila_data_packages = [
'nfs-common'

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

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

2
docker/mariadb/Dockerfile.j2
View File

@ -20,7 +20,7 @@ MAINTAINER {{ maintainer }}
'socat',
'tar'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set mariadb_packages = [
'expect',
'mariadb-galera-server',

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mistral_api_packages = ['openstack-mistral-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set mistral_api_packages = ['mistral-api'] %}
{% endif %}
{{ macros.install_packages(mistral_api_packages | customizable("packages")) }}

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

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mistral_base_packages = ['openstack-mistral-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set mistral_base_packages = ['mistral-common'] %}
{% endif %}
{{ macros.install_packages(mistral_base_packages | customizable("packages")) }}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mistral_engine_packages = ['openstack-mistral-engine'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set mistral_engine_packages = ['mistral-engine'] %}
{% endif %}
{{ macros.install_packages(mistral_engine_packages | customizable("packages")) }}

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

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set mistral_executor_packages = ['openstack-mistral-executor'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set mistral_executor_packages = ['mistral-executor'] %}
{% endif %}
{{ macros.install_packages(mistral_executor_packages | customizable("packages")) }}

2
docker/mongodb/Dockerfile.j2
View File

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
'mongodb',
'mongodb-server'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set mongodb_packages = [
'mongodb-server'
] %}

2
docker/multipathd/Dockerfile.j2
View File

@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set multipathd_packages = ['device-mapper-multipath'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set multipathd_packages = ['multipath-tools'] %}
{% endif %}

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

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip
{% set murano_api_packages = ['openstack-murano-api'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
RUN ln -s /usr/share/murano-common/io.murano.zip /io.murano.zip
{% set murano_api_packages = ['murano-api'] %}
{% endif %}

2
docker/murano/murano-base/Dockerfile.j2
View File

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set murano_base_packages = ['openstack-murano-common'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set murano_base_packages = ['murano-common'] %}
{% endif %}

2
docker/murano/murano-engine/Dockerfile.j2
View File

@ -8,7 +8,7 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set murano_engine_packages = ['openstack-murano-engine'] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set murano_engine_packages = ['murano-engine'] %}
{% endif %}

17
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -7,7 +7,7 @@ MAINTAINER {{ maintainer }}
{{ macros.configure_user(name='neutron') }}
{% if base_distro in ['ubuntu', 'debian'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
{{ macros.debian_haproxy_existing_user_fix() }}
{% endif %}
@ -23,6 +23,17 @@ MAINTAINER {{ maintainer }}
'python-openvswitch'
] %}
{% elif base_distro in ['debian'] %}
{% set neutron_base_packages = [
'iproute2',
'keepalived',
'neutron-plugin-ml2',
'neutron-server',
'openvswitch-switch',
'python-openvswitch'
] %}
{% elif base_distro in ['ubuntu'] %}
{% set neutron_base_packages = [
@ -39,7 +50,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(neutron_base_packages | customizable("packages")) }}
{% if base_distro in ['ubuntu'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
RUN mkdir -p /usr/share/neutron \
&& ln -s /etc/neutron/api-paste.ini /usr/share/neutron/api-paste.ini
@ -61,7 +72,7 @@ RUN mkdir -p /usr/share/neutron \
'uuid'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set neutron_base_packages = [
'conntrack',

2
docker/neutron/neutron-dhcp-agent/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if base_distro in ['ubuntu', 'debian'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% if install_type == 'binary' %}
{% set neutron_dhcp_agent_packages = [

2
docker/neutron/neutron-l3-agent/Dockerfile.j2
View File

@ -6,7 +6,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['ubuntu', 'debian'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% set neutron_l3_agent_packages = [
'neutron-l3-agent'

2
docker/neutron/neutron-lbaas-agent/Dockerfile.j2
View File

@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
'openstack-neutron-lbaas'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set neutron_lbaas_agent_packages = [
'neutron-lbaas-common',

2
docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2
View File

@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
'openstack-neutron-linuxbridge'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set neutron_linuxbridge_agent_packages = [
'ebtables',

2
docker/neutron/neutron-metadata-agent/Dockerfile.j2
View File

@ -5,7 +5,7 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if base_distro in ['ubuntu', 'debian'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% if install_type == 'binary' %}
{% set neutron_metadata_agent_packages = [

2
docker/neutron/neutron-metering-agent/Dockerfile.j2
View File

@ -9,7 +9,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_metering_agent_packages = ['openstack-neutron-metering-agent'] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set neutron_metering_agent_packages = ['neutron-metering-agent'] %}
{% endif %}

2
docker/neutron/neutron-openvswitch-agent/Dockerfile.j2
View File

@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
'openvswitch'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set neutron_openvswitch_agent_packages = [
'neutron-plugin-openvswitch-agent',

2
docker/neutron/neutron-server/Dockerfile.j2
View File

@ -13,7 +13,7 @@ MAINTAINER {{ maintainer }}
'openstack-neutron-vpnaas',
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set neutron_server_packages = [
'neutron-lbaasv2-agent',

6
docker/neutron/neutron-vpnaas-agent/Dockerfile.j2
View File

@ -11,7 +11,7 @@ MAINTAINER {{ maintainer }}
'openstack-neutron-vpn-agent',
'openswan'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set neutron_vpnaas_agent_packages = [
'neutron-vpn-agent',
'strongswan'
@ -26,7 +26,7 @@ MAINTAINER {{ maintainer }}
{% set neutron_vpnaas_agent_packages = [
'openswan'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set neutron_vpnaas_agent_packages = [
'strongswan'
] %}
@ -55,6 +55,6 @@ RUN chmod 755 /usr/local/bin/kolla_neutron_extend_start
# TODO(pbourke): The libreswan driver required by redhat derived bases
# currently requires root in Neutron. Remove this if condition once
# https://bugs.launchpad.net/neutron/+bug/1644517 is addressed.
{% if base_distro in ['ubuntu', 'debian'] %}
{% if base_distro in ['debian', 'ubuntu'] %}
USER neutron
{% endif %}

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

@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
&& sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set nova_api_packages = [
'apache2',
@ -44,7 +44,7 @@ RUN echo > /etc/apache2/ports.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
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set nova_api_packages = [
'apache2',

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

@ -18,7 +18,7 @@ MAINTAINER {{ maintainer }}
'python-keystoneclient'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set nova_base_packages = [
'bridge-utils',
@ -39,7 +39,7 @@ MAINTAINER {{ maintainer }}
'openvswitch'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set nova_base_packages = [
'bridge-utils',

2
docker/nova/nova-compute-ironic/Dockerfile.j2
View File

@ -14,7 +14,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set nova_compute_ironic_packages = [
'nova-compute'

4
docker/nova/nova-compute/Dockerfile.j2
View File

@ -22,7 +22,7 @@ MAINTAINER {{ maintainer }}
{{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
# ironic as workaround https://bugs.launchpad.net/packstack/+bug/1430388
{% set nova_compute_packages = [
@ -62,7 +62,7 @@ RUN rm -f /etc/nova/nova-compute.conf
'targetcli'
] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set nova_compute_packages = [
'ceph-common',

2
docker/nova/nova-conductor/Dockerfile.j2
View File

@ -12,7 +12,7 @@ MAINTAINER {{ maintainer }}
'openstack-nova-conductor'
] %}
{% elif base_distro in ['ubuntu'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set nova_conductor_packages = [
'nova-conductor'

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