From 66413c804699f47e078dec663c281c25ef3e08ca Mon Sep 17 00:00:00 2001 From: junbo Date: Tue, 2 May 2017 17:46:11 +0800 Subject: 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 --- docker/sahara/sahara-engine/Dockerfile.j2 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 index 01e78a9a1..ff0060176 100644 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ b/docker/sahara/sahara-engine/Dockerfile.j2 @@ -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 %} -- cgit v1.2.3