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

1 files changed, 4 insertions, 4 deletions

diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index f0d3e15ba..151bae869 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/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(Allen) Remove python-dogpile-cache after the requirement of
 # python-ironicclient is fixed.
@@ -164,7 +164,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'tcp_wrappers-libs'
         ] %}
 
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
 
 # This will prevent questions from being asked during the install
 ENV DEBIAN_FRONTEND noninteractive
@@ -208,7 +208,7 @@ ENV DEBIAN_FRONTEND noninteractive
 {{ macros.install_packages(openstack_base_packages | customizable("packages")) }}
 
 {% elif install_type == 'source' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
         {% set openstack_base_packages = [
             'gcc',
             'gcc-c++',
@@ -229,7 +229,7 @@ ENV DEBIAN_FRONTEND noninteractive
             'zip'
         ] %}
 
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set openstack_base_packages = [
             'build-essential',
             'ca-certificates',