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/monasca/monasca-api/Dockerfile.j2     | 4 ++--
 docker/monasca/monasca-base/Dockerfile.j2    | 4 ++--
 docker/monasca/monasca-grafana/Dockerfile.j2 | 8 ++++----
 docker/monasca/monasca-thresh/Dockerfile.j2  | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'docker/monasca')

diff --git a/docker/monasca/monasca-api/Dockerfile.j2 b/docker/monasca/monasca-api/Dockerfile.j2
index e9f7b5235..97c96d95b 100644
--- a/docker/monasca/monasca-api/Dockerfile.j2
+++ b/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',
         ] %}
diff --git a/docker/monasca/monasca-base/Dockerfile.j2 b/docker/monasca/monasca-base/Dockerfile.j2
index bdf5e1475..6adc1a91b 100644
--- a/docker/monasca/monasca-base/Dockerfile.j2
+++ b/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',
diff --git a/docker/monasca/monasca-grafana/Dockerfile.j2 b/docker/monasca/monasca-grafana/Dockerfile.j2
index df8bb8c35..4a88bb0a2 100644
--- a/docker/monasca/monasca-grafana/Dockerfile.j2
+++ b/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 %}
 
diff --git a/docker/monasca/monasca-thresh/Dockerfile.j2 b/docker/monasca/monasca-thresh/Dockerfile.j2
index 31c4abdd0..10170fb46 100644
--- a/docker/monasca/monasca-thresh/Dockerfile.j2
+++ b/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',
-- 
cgit v1.2.3