diff options
| author | Mark Goddard <mark@stackhpc.com> | 2017-06-06 19:13:43 +0100 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2017-06-07 09:48:23 +0100 |
| commit | f8285c336a6db3b447d7343a4e06fde195f46fe9 (patch) | |
| tree | bf3d0aab5aece142e6e807a025fea18d785ff604 | |
| parent | 1253c694f09213a8056cc7715c153333d3e1ee64 (diff) | |
| download | kolla-f8285c336a6db3b447d7343a4e06fde195f46fe9.tar.gz kolla-f8285c336a6db3b447d7343a4e06fde195f46fe9.zip | |
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
| -rw-r--r-- | docker/sahara/sahara-engine/Dockerfile.j2 | 10 |
1 files 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'] %} |