openstack/kolla-ansible
Code Issues Proposed changes

Merge "Remove the unnecessary "if" condition"

Browse Source
This commit is contained in:
Jenkins 2016-10-24 08:25:19 +00:00 committed by Gerrit Code Review
commit 3abf37f769
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
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 = [
'jq',
{% set kubetoolbox_packages = [ 'ceph-common',
'jq', 'ipmitool'
'ceph-common', ] %}
'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")) }}