From ae1322ec10861678abe1137f3013030b34335bc7 Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 15 Jan 2019 16:58:25 -0700
Subject: 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/watcher/watcher-api/Dockerfile.j2     | 4 ++--
 docker/watcher/watcher-applier/Dockerfile.j2 | 4 ++--
 docker/watcher/watcher-base/Dockerfile.j2    | 4 ++--
 docker/watcher/watcher-engine/Dockerfile.j2  | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'docker/watcher')

diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2
index 767b9595c..7df63c0ea 100644
--- a/docker/watcher/watcher-api/Dockerfile.j2
+++ b/docker/watcher/watcher-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 watcher_api_packages = ['openstack-watcher-api'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set watcher_api_packages = ['watcher-api'] %}
     {% endif %}
 {{ macros.install_packages(watcher_api_packages | customizable("packages")) }}
diff --git a/docker/watcher/watcher-applier/Dockerfile.j2 b/docker/watcher/watcher-applier/Dockerfile.j2
index c67c77275..925ac2bbf 100644
--- a/docker/watcher/watcher-applier/Dockerfile.j2
+++ b/docker/watcher/watcher-applier/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 watcher_applier_packages = ['openstack-watcher-applier'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set watcher_applier_packages = ['watcher-applier'] %}
     {% endif %}
 {{ macros.install_packages(watcher_applier_packages | customizable("packages")) }}
diff --git a/docker/watcher/watcher-base/Dockerfile.j2 b/docker/watcher/watcher-base/Dockerfile.j2
index 7ad23c9bd..33b1cc962 100644
--- a/docker/watcher/watcher-base/Dockerfile.j2
+++ b/docker/watcher/watcher-base/Dockerfile.j2
@@ -8,9 +8,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='watcher') }}
 
 {% if install_type == 'binary' %}
-    {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+    {% if base_package_type == 'rpm' %}
         {% set watcher_base_packages = ['openstack-watcher-common'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set watcher_base_packages = ['watcher-common'] %}
     {% endif %}
 {{ macros.install_packages(watcher_base_packages | customizable("packages")) }}
diff --git a/docker/watcher/watcher-engine/Dockerfile.j2 b/docker/watcher/watcher-engine/Dockerfile.j2
index 79c422f42..29a434d7b 100644
--- a/docker/watcher/watcher-engine/Dockerfile.j2
+++ b/docker/watcher/watcher-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 watcher_engine_packages = ['openstack-watcher-decision-engine'] %}
-    {% elif base_distro in ['debian', 'ubuntu'] %}
+    {% elif base_package_type == 'deb' %}
         {% set watcher_engine_packages = ['watcher-decision-engine'] %}
     {% endif %}
 {{ macros.install_packages(watcher_engine_packages | customizable("packages")) }}
-- 
cgit v1.2.3