Browse Source

Use base_package_type

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
changes/01/631101/4
Alex Schultz 3 years ago
parent
commit
ae1322ec10
  1. 4
      docker/aodh/aodh-api/Dockerfile.j2
  2. 8
      docker/aodh/aodh-base/Dockerfile.j2
  3. 4
      docker/aodh/aodh-evaluator/Dockerfile.j2
  4. 4
      docker/aodh/aodh-expirer/Dockerfile.j2
  5. 4
      docker/aodh/aodh-listener/Dockerfile.j2
  6. 4
      docker/aodh/aodh-notifier/Dockerfile.j2
  7. 4
      docker/barbican/barbican-api/Dockerfile.j2
  8. 8
      docker/barbican/barbican-base/Dockerfile.j2
  9. 4
      docker/barbican/barbican-keystone-listener/Dockerfile.j2
  10. 4
      docker/barbican/barbican-worker/Dockerfile.j2
  11. 10
      docker/base/Dockerfile.j2
  12. 8
      docker/bifrost/bifrost-base/Dockerfile.j2
  13. 4
      docker/ceilometer/ceilometer-base/Dockerfile.j2
  14. 4
      docker/ceilometer/ceilometer-central/Dockerfile.j2
  15. 8
      docker/ceilometer/ceilometer-compute/Dockerfile.j2
  16. 8
      docker/ceilometer/ceilometer-ipmi/Dockerfile.j2
  17. 4
      docker/ceilometer/ceilometer-notification/Dockerfile.j2
  18. 4
      docker/ceph/ceph-base/Dockerfile.j2
  19. 4
      docker/ceph/ceph-nfs/Dockerfile.j2
  20. 4
      docker/certmonger/Dockerfile.j2
  21. 8
      docker/cinder/cinder-api/Dockerfile.j2
  22. 8
      docker/cinder/cinder-backup/Dockerfile.j2
  23. 8
      docker/cinder/cinder-base/Dockerfile.j2
  24. 2
      docker/cinder/cinder-scheduler/Dockerfile.j2
  25. 6
      docker/cinder/cinder-volume/Dockerfile.j2
  26. 8
      docker/cloudkitty/cloudkitty-api/Dockerfile.j2
  27. 4
      docker/cloudkitty/cloudkitty-base/Dockerfile.j2
  28. 4
      docker/cloudkitty/cloudkitty-processor/Dockerfile.j2
  29. 2
      docker/collectd/Dockerfile.j2
  30. 4
      docker/congress/congress-base/Dockerfile.j2
  31. 4
      docker/crane/Dockerfile.j2
  32. 4
      docker/cron/Dockerfile.j2
  33. 4
      docker/designate/designate-api/Dockerfile.j2
  34. 6
      docker/designate/designate-backend-bind9/Dockerfile.j2
  35. 4
      docker/designate/designate-base/Dockerfile.j2
  36. 4
      docker/designate/designate-central/Dockerfile.j2
  37. 4
      docker/designate/designate-mdns/Dockerfile.j2
  38. 8
      docker/designate/designate-pool-manager/Dockerfile.j2
  39. 4
      docker/designate/designate-producer/Dockerfile.j2
  40. 4
      docker/designate/designate-sink/Dockerfile.j2
  41. 8
      docker/designate/designate-worker/Dockerfile.j2
  42. 4
      docker/dind/Dockerfile.j2
  43. 4
      docker/dragonflow/dragonflow-base/Dockerfile.j2
  44. 4
      docker/ec2-api/Dockerfile.j2
  45. 4
      docker/elasticsearch/Dockerfile.j2
  46. 4
      docker/etcd/Dockerfile.j2
  47. 14
      docker/fluentd/Dockerfile.j2
  48. 4
      docker/freezer/freezer-api/Dockerfile.j2
  49. 2
      docker/glance/glance-api/Dockerfile.j2
  50. 4
      docker/glance/glance-base/Dockerfile.j2
  51. 4
      docker/gnocchi/gnocchi-api/Dockerfile.j2
  52. 8
      docker/gnocchi/gnocchi-base/Dockerfile.j2
  53. 4
      docker/gnocchi/gnocchi-metricd/Dockerfile.j2
  54. 2
      docker/gnocchi/gnocchi-statsd/Dockerfile.j2
  55. 2
      docker/grafana/Dockerfile.j2
  56. 2
      docker/haproxy/Dockerfile.j2
  57. 4
      docker/heat/heat-all/Dockerfile.j2
  58. 4
      docker/heat/heat-api-cfn/Dockerfile.j2
  59. 4
      docker/heat/heat-api/Dockerfile.j2
  60. 8
      docker/heat/heat-base/Dockerfile.j2
  61. 4
      docker/heat/heat-engine/Dockerfile.j2
  62. 4
      docker/helm-repository/Dockerfile.j2
  63. 8
      docker/horizon/Dockerfile.j2
  64. 6
      docker/ironic-inspector/Dockerfile.j2
  65. 12
      docker/ironic/ironic-api/Dockerfile.j2
  66. 4
      docker/ironic/ironic-base/Dockerfile.j2
  67. 8
      docker/ironic/ironic-conductor/Dockerfile.j2
  68. 4
      docker/ironic/ironic-pxe/Dockerfile.j2
  69. 4
      docker/iscsid/Dockerfile.j2
  70. 4
      docker/kafka/Dockerfile.j2
  71. 4
      docker/keepalived/Dockerfile.j2
  72. 8
      docker/keystone/keystone-base/Dockerfile.j2
  73. 4
      docker/keystone/keystone-fernet/Dockerfile.j2
  74. 4
      docker/keystone/keystone-ssh/Dockerfile.j2
  75. 8
      docker/keystone/keystone/Dockerfile.j2
  76. 4
      docker/kolla-toolbox/Dockerfile.j2
  77. 4
      docker/kube/kube-controller-manager/Dockerfile.j2
  78. 4
      docker/kuryr/kuryr-libnetwork/Dockerfile.j2
  79. 8
      docker/logstash/Dockerfile.j2
  80. 4
      docker/magnum/magnum-api/Dockerfile.j2
  81. 4
      docker/magnum/magnum-base/Dockerfile.j2
  82. 4
      docker/magnum/magnum-conductor/Dockerfile.j2
  83. 8
      docker/manila/manila-api/Dockerfile.j2
  84. 8
      docker/manila/manila-base/Dockerfile.j2
  85. 6
      docker/manila/manila-data/Dockerfile.j2
  86. 2
      docker/manila/manila-scheduler/Dockerfile.j2
  87. 8
      docker/manila/manila-share/Dockerfile.j2
  88. 6
      docker/mariadb/Dockerfile.j2
  89. 8
      docker/mistral/mistral-api/Dockerfile.j2
  90. 4
      docker/mistral/mistral-base/Dockerfile.j2
  91. 4
      docker/mistral/mistral-engine/Dockerfile.j2
  92. 4
      docker/mistral/mistral-event-engine/Dockerfile.j2
  93. 4
      docker/mistral/mistral-executor/Dockerfile.j2
  94. 4
      docker/monasca/monasca-api/Dockerfile.j2
  95. 4
      docker/monasca/monasca-base/Dockerfile.j2
  96. 8
      docker/monasca/monasca-grafana/Dockerfile.j2
  97. 4
      docker/monasca/monasca-thresh/Dockerfile.j2
  98. 4
      docker/mongodb/Dockerfile.j2
  99. 4
      docker/multipathd/Dockerfile.j2
  100. 4
      docker/murano/murano-api/Dockerfile.j2

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

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

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

@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='aodh') }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set aodh_base_packages = [
'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/ \
&& 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 ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set aodh_base_packages = [
'aodh-common',
@ -40,7 +40,7 @@ RUN mkdir -p /var/www/cgi-bin/aodh \
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set aodh_base_packages = [
'httpd',
@ -53,7 +53,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 ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set aodh_base_packages = [
'apache2',

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

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

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

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

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

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

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

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

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

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set barbican_api_packages = [
'httpd',
'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 \
&& 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 = [
'apache2',
'barbican-api',

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

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

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

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% 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'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set barbican_keystone_listener_packages = ['barbican-keystone-listener'] %}
{% endif %}

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

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

10
docker/base/Dockerfile.j2

@ -27,7 +27,7 @@ RUN cat /tmp/kolla_bashrc >> /etc/skel/.bashrc \
# PS1 var when used /bin/sh shell
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
# 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
@ -210,7 +210,7 @@ RUN yum -y install \
#### END REPO ENABLEMENT
{# 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 = [
'gcc',
@ -252,8 +252,8 @@ 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 ['debian', 'ubuntu'] %}
{# endif for base_package_type rpm #}
{% elif base_package_type == 'deb' %}
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
@ -391,7 +391,7 @@ RUN sed -i \
&& ln -s dist-packages /usr/lib/python2.7/site-packages
{% endif %}
{# endif for base_distro debian, ubuntu #}
{# endif base_package_type deb #}
{% endif %}
COPY set_configs.py /usr/local/bin/kolla_set_configs

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

@ -26,17 +26,17 @@ RUN ln -s bifrost-base-source/* 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. #}
RUN rm -f /etc/yum.repos.d/rabbitmq_rabbitmq-server.repo \
&& 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 \
&& apt-get purge -y mariadb* mysql*
{% endif %}
{% block bifrost_ansible_install %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% if base_package_type == 'deb' %}
RUN apt-get update && \
{% else %}
RUN echo " " && \
@ -44,7 +44,7 @@ RUN echo " " && \
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 ['debian', 'ubuntu'] %}
{% if base_package_type == 'deb' %}
apt-get clean && rm -rf /var/lib/apt/lists/*'
{% else %}
yum clean all && rm -rf /var/yum/cache'

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

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

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

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% 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'] %}
{% endif %}

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

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

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

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

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

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% 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'] %}
{% endif %}

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

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

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

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

4
docker/certmonger/Dockerfile.j2

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

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

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

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

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

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

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

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

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

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

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

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

@ -6,7 +6,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set cloudkitty_api_packages = [
'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 \
&& 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 }}' \
&& /bin/false
@ -27,7 +27,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set cloudkitty_api_packages = [
'httpd',
'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 \
&& 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 = [
'apache2',
'libapache2-mod-wsgi'

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

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

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

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

2
docker/collectd/Dockerfile.j2

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

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

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

4
docker/crane/Dockerfile.j2

@ -26,7 +26,7 @@ RUN echo 'crane not yet available for {{ base_distro }}' && /bin/false
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set crane_packages = [
'httpd',
'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 \
&& 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
{% endif %}

4
docker/cron/Dockerfile.j2

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

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

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

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

@ -5,19 +5,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% 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'] %}
{{ 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'] %}
{{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }}
{% 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 }} \
&& chown -R root: /var/lib/{{ designate_backend_bind_name }} /run/{{ designate_backend_bind_name }} \

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

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

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

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

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

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

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

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

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

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

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

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

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

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

4
docker/dind/Dockerfile.j2

@ -5,14 +5,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% 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
# 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
RUN /bin/true
{% elif base_distro in ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set dind_packages = [
'btrfs-progs',
'openssh-server'

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

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

4
docker/ec2-api/Dockerfile.j2

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

4
docker/elasticsearch/Dockerfile.j2

@ -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') }}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set elasticsearch_packages = [
'elasticsearch',
'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/
{% elif base_distro in ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set elasticsearch_packages = [
'default-jre-headless',
'elasticsearch',

4
docker/etcd/Dockerfile.j2

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

14
docker/fluentd/Dockerfile.j2

@ -5,7 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% 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') }}
# 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'
] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{{ macros.configure_user(name='td-agent', groups='mysql') }}
{% set fluentd_packages = [
'g++',
@ -41,12 +41,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.install_packages(fluentd_packages | customizable("packages")) }}
# 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
RUN chmod 440 /etc/sudoers.d/kolla_fluentd_sudoers \
&& mkdir -p /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
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 \
@ -60,7 +60,7 @@ RUN chmod 755 /usr/local/bin/kolla_extend_start
{% block fluentd_plugins_install %}
{% if base_distro in ['debian', 'ubuntu'] %}
{% if base_package_type == 'deb' %}
{% set fluentd_plugins = [
'fluent-plugin-elasticsearch',
'fluent-plugin-grep',
@ -90,8 +90,8 @@ RUN tar -xvf /tmp/fluentd-monasca.tar.gz -C /tmp \
{% block fluentd_footer %}{% endblock %}
{% block footer %}{% endblock %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
USER fluentd
{% elif base_distro in ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
USER td-agent
{% endif %}

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

@ -12,7 +12,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set freezer_api_packages = [
'httpd',
'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 \
&& 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 = [
'apache2',
'libapache2-mod-wsgi'

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

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

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

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

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

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

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

@ -8,7 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='gnocchi') }}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [
'httpd',
@ -22,7 +22,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ 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 ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set gnocchi_base_packages = [
'apache2',
@ -45,7 +45,7 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set gnocchi_base_packages = [
'httpd',
@ -69,7 +69,7 @@ RUN {{ macros.install_pip(gnocchi_base_pip_packages | customizable("pip_packages
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 ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set gnocchi_base_packages = [
'apache2',

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

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

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

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

2
docker/grafana/Dockerfile.j2

@ -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'
] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set grafana_packages = [
'libfontconfig',

2
docker/haproxy/Dockerfile.j2

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

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

@ -6,13 +6,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set heat_all_packages = [
'openstack-heat-api',
'openstack-heat-engine',
'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
{% endif %}
{{ macros.install_packages(heat_all_packages | customizable("packages")) }}

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

@ -6,9 +6,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% 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'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set heat_api_cfn_packages = ['heat-api-cfn'] %}
{% endif %}
{{ macros.install_packages(heat_api_cfn_packages | customizable("packages")) }}

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

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

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

@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set heat_base_packages = [
'httpd',
'mod_ssl',
@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ 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 ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set heat_base_packages = [
'apache2',
'heat-common',
@ -31,7 +31,7 @@ RUN echo > /etc/apache2/ports.conf
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set heat_base_packages = [
'httpd',
@ -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 ['debian', 'ubuntu'] %}
{% elif base_package_type == 'deb' %}
{% set heat_base_packages = [
'apache2',

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

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

4
docker/helm-repository/Dockerfile.j2

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

8
docker/horizon/Dockerfile.j2

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

6
docker/ironic-inspector/Dockerfile.j2

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

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

@ -6,14 +6,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% if base_package_type == 'rpm' %}
{% set ironic_api_packages = [
'httpd',
'mod_ssl',