diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-24 08:25:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-24 08:25:19 +0000 |
| commit | 3abf37f76985bf27e0f8ce8f5721852024723f60 (patch) | |
| tree | 2fd602ea818dd6a3790caa6ff4c7ad9cdc0ece97 | |
| parent | 430ddf9dd3fb50c910631eb331a21c1af24ab43c (diff) | |
| parent | 5c6cddbcf6aa312cb9c3ddce2c6c74833395515d (diff) | |
| download | kolla-3abf37f76985bf27e0f8ce8f5721852024723f60.tar.gz kolla-3abf37f76985bf27e0f8ce8f5721852024723f60.zip | |
Merge "Remove the unnecessary "if" condition"
| -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")) }} |