diff options
| author | junbo <jiang.junbo@99cloud.net> | 2017-05-02 17:46:11 +0800 |
|---|---|---|
| committer | junbo <jiang.junbo@99cloud.net> | 2017-05-02 21:33:15 +0800 |
| commit | 66413c804699f47e078dec663c281c25ef3e08ca (patch) | |
| tree | 9c0ca71cdf4931c80bae6d52c73a4ac981b0bcba /docker | |
| parent | 4433a95698da147f3eae8f12b526c2fc204b7a42 (diff) | |
| download | kolla-66413c804699f47e078dec663c281c25ef3e08ca.tar.gz kolla-66413c804699f47e078dec663c281c25ef3e08ca.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/sahara/sahara-engine/Dockerfile.j2 | 9 |
1 files changed, 8 insertions, 1 deletions
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 %} |