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

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")) }}

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',

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")) }}

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")) }}

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")) }}

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")) }}

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',

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 %}
 

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 %}
 

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 %}
 

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 #}
+{# endif for base_package_type rpm #}
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
 
 RUN if [ $(awk -F '=' '/DISTRIB_RELEASE/{print $2}' /etc/lsb-release) != "{{ supported_distro_release }}" ]; then \
         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

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'

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',

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 %}
 

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'
          ] %}

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'
          ] %}

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 %}
 

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',

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'

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'
     ] %}

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'

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'
         ] %}

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',

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'
         ] %}

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',

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'

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

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

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',

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']
         %}

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 %}
 

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'

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")) }}

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 }} \

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'

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")) }}

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")) }}

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'
         ] %}

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")) }}

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'

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'
         ] %}

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'

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'
     ] %}

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

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',

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")) }}

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 %}

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'

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 %}
 

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',

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")) }}

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',

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")) }}

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'] %}

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',

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 %}
 

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")) }}

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")) }}

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")) }}

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',

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")) }}

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',

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',

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 %}
 

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

docker/ironic/ironic-base/Dockerfile.j2

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

docker/ironic/ironic-conductor/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' %}
         # TODO(Jeffrey4l): no python-oneviewclient
         {% set ironic_conductor_packages = [
             'ansible',
@@ -40,7 +40,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
                 'qemu-img'
             ] %}
         {% endif %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
         # ImcSdk package, python-sushy, ironic-staging-drivers
         {% set ironic_conductor_packages = [
@@ -64,7 +64,7 @@ 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 ironic_conductor_packages = [
             'dosfstools',
             'e2fsprogs',
@@ -78,7 +78,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'util-linux',
             'xfsprogs',
         ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set ironic_conductor_packages = [
             'bsdmainutils',
             'dosfstools',

docker/ironic/ironic-pxe/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 ironic_pxe_packages = [
         'httpd',
         'ipxe-bootimgs',
@@ -31,7 +31,7 @@ ENV ironic_arch=aarch64
 {{ 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 ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
     {% set ironic_pxe_packages = [
         'apache2',
         'ipxe',

docker/iscsid/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' %}
     {% set iscsid_packages = [
         'iscsi-initiator-utils',
         'python-rtslib',
         'targetcli'
     ] %}
 
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
     {% set iscsid_packages = [
         'open-iscsi',
         'python-rtslib-fb',

docker/kafka/Dockerfile.j2

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

docker/keepalived/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 keepalived_packages = [
         'hostname',
         'keepalived'
     ] %}
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
     {% set keepalived_packages = [
         'keepalived'
     ] %}

docker/keystone/keystone-base/Dockerfile.j2

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

docker/keystone/keystone-fernet/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 keystone_fernet_packages = [
         'cronie',
         'openssh-clients',
         'rsync'
     ] %}
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
     {% set keystone_fernet_packages = [
         'cron',
         'openssh-client',

docker/keystone/keystone-ssh/Dockerfile.j2

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

docker/keystone/keystone/Dockerfile.j2

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

docker/kolla-toolbox/Dockerfile.j2

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

docker/kube/kube-controller-manager/Dockerfile.j2

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

docker/kuryr/kuryr-libnetwork/Dockerfile.j2

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

docker/logstash/Dockerfile.j2

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

docker/magnum/magnum-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 magnum_api_packages = ['openstack-magnum-api'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
        {% set magnum_api_packages = ['magnum-api'] %}
     {% endif %}
 {{ macros.install_packages(magnum_api_packages | customizable("packages")) }}

docker/magnum/magnum-base/Dockerfile.j2

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

docker/magnum/magnum-conductor/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 magnum_conductor_packages = [
              'openstack-magnum-conductor'
          ] %}
 
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set magnum_conductor_packages = [
              'magnum-conductor'
          ] %}

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

docker/manila/manila-base/Dockerfile.j2

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

docker/manila/manila-data/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 manila_data_packages = [
                 'manila-data'
@@ -15,13 +15,13 @@ 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 manila_data_packages = [
                 'nfs-utils'
         ] %}
 
-     {% elif base_distro in ['debian', 'ubuntu'] %}
+     {% elif base_package_type == 'deb' %}
 
         {% set manila_data_packages = [
                 'nfs-common'

docker/manila/manila-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 manila_scheduler_packages = [
                 'manila-scheduler'

docker/manila/manila-share/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 manila_share_packages = [
             'openstack-manila-share',
             'ceph-common'
         ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set manila_share_packages = [
             'manila-share',
             'ceph-common'
@@ -23,11 +23,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.install_packages(manila_share_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
         {% set manila_share_packages = [
             'ceph-common'
         ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set manila_share_packages = [
             'ceph-common'
         ] %}

docker/mariadb/Dockerfile.j2

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

docker/mistral/mistral-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 mistral_api_packages = [
             'httpd',
             'mod_ssl',
@@ -17,7 +17,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
     && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
 
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set mistral_api_packages = [
             'apache2',
             'libapache2-mod-wsgi',
@@ -28,7 +28,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 mistral_api_packages = [
             'httpd',
             'mod_ssl',
@@ -38,7 +38,7 @@ RUN echo > /etc/apache2/ports.conf
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
     && sed -i -r 's,^(Listen 443),#\1,' /etc/httpd/conf.d/ssl.conf
 
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set mistral_api_packages = [
             'apache2',
             'libapache2-mod-wsgi'

docker/mistral/mistral-base/Dockerfile.j2

@@ -9,14 +9,14 @@ 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 mistral_base_packages = [
             'openstack-mistral-common',
             'openstack-tacker',
             'redis',
         ] %}
 # Note(egonzalez): Ubuntu does not have tacker packages yet.
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set mistral_base_packages = [
             'mistral-common',
             'redis-server'

docker/mistral/mistral-engine/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 mistral_engine_packages = ['openstack-mistral-engine'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set mistral_engine_packages = ['mistral-engine'] %}
     {% endif %}
 {{ macros.install_packages(mistral_engine_packages | customizable("packages")) }}

docker/mistral/mistral-event-engine/Dockerfile.j2

@@ -6,10 +6,10 @@ 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 mistral_event_engine_packages = ['openstack-mistral-event-engine'] %}
 {{ macros.install_packages(mistral_event_engine_packages | customizable("packages")) }}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
 RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     && /bin/false
     {% endif %}

docker/mistral/mistral-executor/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 mistral_executor_packages = ['openstack-mistral-executor'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set mistral_executor_packages = ['mistral-executor'] %}
     {% endif %}
 {{ macros.install_packages(mistral_executor_packages | customizable("packages")) }}

docker/monasca/monasca-api/Dockerfile.j2

@@ -12,11 +12,11 @@ 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 monasca_api_packages = [
             'mariadb',
         ] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set monasca_api_packages = [
             'mariadb-client',
         ] %}

docker/monasca/monasca-base/Dockerfile.j2

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

docker/monasca/monasca-grafana/Dockerfile.j2

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

docker/monasca/monasca-thresh/Dockerfile.j2

@@ -16,14 +16,14 @@ 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 monasca_thresh_packages = [
         'maven',
     ] %}
 
 ENV JAVA_HOME /usr/lib/jvm/jre-1.8.0-openjdk/
 
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
     {% set monasca_thresh_packages = [
         'openjdk-8-jdk-headless',
         'maven',

docker/mongodb/Dockerfile.j2

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

docker/multipathd/Dockerfile.j2

@@ -5,9 +5,9 @@ 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 multipathd_packages = ['device-mapper-multipath'] %}
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
     {% set multipathd_packages = ['multipath-tools'] %}
 {% endif %}
 

docker/murano/murano-api/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' %}
 RUN ln -s /var/cache/murano/meta/io.murano.zip /io.murano.zip \
     && ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip
        {% set murano_api_packages = ['openstack-murano-api'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
 RUN ln -s /usr/share/murano-common/io.murano.zip /io.murano.zip \
     && ln -s /var/cache/murano/meta/io.murano.applications.zip /io.murano.applications.zip
         {% set murano_api_packages = ['murano-api'] %}