aboutsummaryrefslogtreecommitdiff
path: root/docker/skydive/skydive-agent
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/skydive/skydive-agent
parent8344c8ea21428c5978d3c5e7ae74d6e43dd8ba95 (diff)
parentae1322ec10861678abe1137f3013030b34335bc7 (diff)
downloadkolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.tar.gz
kolla-cea1c1ebd95e88e0bb2911fea486fe09f600af22.zip
Merge "Use base_package_type"
Diffstat (limited to 'docker/skydive/skydive-agent')
-rw-r--r--docker/skydive/skydive-agent/Dockerfile.j24
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/skydive/skydive-agent/Dockerfile.j2 b/docker/skydive/skydive-agent/Dockerfile.j2
index 35862deee..87a1729f9 100644
--- a/docker/skydive/skydive-agent/Dockerfile.j2
+++ b/docker/skydive/skydive-agent/Dockerfile.j2
@@ -6,12 +6,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% import "macros.j2" as macros with context %}
{% block skydive_agent_install %}
-{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
+{% if base_package_type == 'rpm' %}
{% set skydive_agent_packages = [
'openvswitch',
'skydive-agent'
] %}
-{% elif base_distro in ['debian', 'ubuntu'] %}
+{% elif base_package_type == 'deb' %}
{% set skydive_agent_packages = ['openvswitch-common'] %}
{% endif %}
{{ macros.install_packages(skydive_agent_packages | customizable("packages")) }}