diff options
| author | caoyuan <cao.yuan@99cloud.net> | 2016-10-22 00:20:18 +0800 |
|---|---|---|
| committer | caoyuan <cao.yuan@99cloud.net> | 2016-10-22 00:20:18 +0800 |
| commit | 5c6cddbcf6aa312cb9c3ddce2c6c74833395515d (patch) | |
| tree | 1aabbaccfd0b9a7b8af70b356310d34081f4db72 | |
| parent | 277f6c058b263e79620e7be346c7cb1faac7fb17 (diff) | |
| download | kolla-5c6cddbcf6aa312cb9c3ddce2c6c74833395515d.tar.gz kolla-5c6cddbcf6aa312cb9c3ddce2c6c74833395515d.zip | |
Remove the unnecessary "if" condition
TrivialFix
Change-Id: Ib7f07b88055594e594604ed2c4471058719cba56
| -rw-r--r-- | docker/kubetoolbox/Dockerfile.j2 | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2 index 59db2d8f3..0fd631d2e 100644 --- a/docker/kubetoolbox/Dockerfile.j2 +++ b/docker/kubetoolbox/Dockerfile.j2 @@ -5,22 +5,11 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} -{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - - {% set kubetoolbox_packages = [ - 'jq', - 'ceph-common', - 'ipmitool' - ] %} - -{% elif base_distro in ['ubuntu', 'debian'] %} - - {% set kubetoolbox_packages = [ - 'jq', - 'ceph-common', - 'ipmitool' - ] %} -{% endif %} +{% set kubetoolbox_packages = [ + 'jq', + 'ceph-common', + 'ipmitool' +] %} {{ macros.install_packages(kubetoolbox_packages | customizable("packages")) }} |