openstack
/
kolla
Code Issues Proposed changes

Add netcat package in sahara-engine image 

Sahara-engine use netcat in the neutron namespace to build
a session when use_namespaces=true, see utils/ssh_remote.py
in sahara source code.

Change-Id: I8a90d33f0b7b902e059077c3b9fd32ba7b7d7df4
Related-Bug: #1687624
Closes-Bug: #1687602
(cherry picked from commit 66413c8046)
This commit is contained in:
junbo 2017-05-02 17:46:11 +08:00
parent 90ef645a51
commit be95a8f78c
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 @@ MAINTAINER {{ maintainer }}
{% elif base_distro in ['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 %}