openstack/kolla
Code Issues Proposed changes

Merge "Add netcat package in sahara-engine image"

Browse Source
This commit is contained in:
Jenkins 2017-05-04 13:58:08 +00:00 committed by Gerrit Code Review
commit 51e94df062
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/sahara/sahara-engine/Dockerfile.j2
View File

@ -11,9 +11,16 @@ LABEL maintainer="{{ maintainer }}"
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set sahara_engine_packages = ['sahara-engine'] %}
{% endif %}
{% elif install_type == 'source' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set sahara_engine_packages = ['nc'] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set sahara_engine_packages = ['netcat'] %}
{% endif %}
{% endif %}
{{ macros.install_packages(sahara_engine_packages | customizable("packages")) }}
{% endif %}
{% block sahara_engine_footer %}{% endblock %}
{% block footer %}{% endblock %}