aboutsummaryrefslogtreecommitdiff
path: root/docker/monasca/monasca-thresh
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2019-01-18 21:01:55 +0000
committerGerrit Code Review <review@openstack.org>2019-01-18 21:01:55 +0000
commitcea1c1ebd95e88e0bb2911fea486fe09f600af22 (patch)
treea53f9c4f6c1fce4364758a5de52ccebc68c36120 /docker/monasca/monasca-thresh
parent8344c8ea21428c5978d3c5e7ae74d6e43dd8ba95 (diff)
parentae1322ec10861678abe1137f3013030b34335bc7 (diff)
downloadkolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.tar.gz
kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.zip
Merge "Use base_package_type"
Diffstat (limited to 'docker/monasca/monasca-thresh')
-rw-r--r--docker/monasca/monasca-thresh/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
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',