diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-07 13:42:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-07 13:42:16 +0000 |
| commit | b1a6e27f6d75daa5b266be5160a13f94164963b0 (patch) | |
| tree | af872836960f03bcb4f794fa17a037784dd30c84 | |
| parent | 2f8a62cd78a9b3654be432868663d682d2ae0e88 (diff) | |
| parent | f8285c336a6db3b447d7343a4e06fde195f46fe9 (diff) | |
| download | kolla-b1a6e27f6d75daa5b266be5160a13f94164963b0.tar.gz kolla-b1a6e27f6d75daa5b266be5160a13f94164963b0.zip | |
Merge "Add netcat to binary sahara-engine image"
| -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'] %} |