From f8285c336a6db3b447d7343a4e06fde195f46fe9 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 6 Jun 2017 19:13:43 +0100 Subject: Add netcat to binary sahara-engine image Sahara-engine uses netcat in the neutron namespace to build a session when use_namespaces=true, see utils/ssh_remote.py in sahara source code. Change I8a90d33f0b7b902e059077c3b9fd32ba7b7d7df4 added netcat to the sahara-engine image for source builds. This change does the same for binary builds. Change-Id: I571236d127e34da79367ec4686d7d64430a22fc8 Related-Bug: #1687624 Closes-Bug: #1687602 --- docker/sahara/sahara-engine/Dockerfile.j2 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docker/sahara/sahara-engine/Dockerfile.j2 b/docker/sahara/sahara-engine/Dockerfile.j2 index 0e9560fa4..a9cc0468a 100644 --- a/docker/sahara/sahara-engine/Dockerfile.j2 +++ b/docker/sahara/sahara-engine/Dockerfile.j2 @@ -7,9 +7,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set sahara_engine_packages = ['openstack-sahara-engine'] %} + {% set sahara_engine_packages = [ + 'nc', + 'openstack-sahara-engine', + ] %} {% elif base_distro in ['debian', 'ubuntu'] %} - {% set sahara_engine_packages = ['sahara-engine'] %} + {% set sahara_engine_packages = [ + 'netcat', + 'sahara-engine', + ] %} {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} -- cgit v1.2.3