From 5c6cddbcf6aa312cb9c3ddce2c6c74833395515d Mon Sep 17 00:00:00 2001
From: caoyuan <cao.yuan@99cloud.net>
Date: Sat, 22 Oct 2016 00:20:18 +0800
Subject: [PATCH] Remove the unnecessary "if" condition
TrivialFix
Change-Id: Ib7f07b88055594e594604ed2c4471058719cba56
---
docker/kubetoolbox/Dockerfile.j2 | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/docker/kubetoolbox/Dockerfile.j2 b/docker/kubetoolbox/Dockerfile.j2
index 59db2d8f31..0fd631d2e1 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")) }}