openstack/kolla
Code Issues Proposed changes

Add netcat to binary sahara-engine image

Browse Source 
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
This commit is contained in:
Mark Goddard 2017-06-06 19:13:43 +01:00
parent 1253c694f0
commit f8285c336a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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'] %}