openstack/kolla-ansible
Code Issues Proposed changes

Remove the unnecessary "if" condition

Browse Source 
TrivialFix

Change-Id: Ib7f07b88055594e594604ed2c4471058719cba56
This commit is contained in:
caoyuan 2016-10-22 00:20:18 +08:00
parent 277f6c058b
commit 5c6cddbcf6
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/kubetoolbox/Dockerfile.j2
View File

@ -5,22 +5,11 @@ MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %} {% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% set kubetoolbox_packages = [
{% set kubetoolbox_packages = [
'jq', 'jq',
'ceph-common', 'ceph-common',
'ipmitool' 'ipmitool'
] %} ] %}
{% elif base_distro in ['ubuntu', 'debian'] %}
{% set kubetoolbox_packages = [
'jq',
'ceph-common',
'ipmitool'
] %}
{% endif %}
{{ macros.install_packages(kubetoolbox_packages | customizable("packages")) }} {{ macros.install_packages(kubetoolbox_packages | customizable("packages")) }}