diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-05-04 13:58:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-05-04 13:58:09 +0000 |
| commit | 51e94df0620e4c8af40bad752d369e9108508e54 (patch) | |
| tree | 16c63212b8d670e927c717e262771063d5de3d7c | |
| parent | 1d9b3a3f87dee53b3bc5ec3a1b6c841ef6dc64a9 (diff) | |
| parent | 66413c804699f47e078dec663c281c25ef3e08ca (diff) | |
| download | kolla-51e94df0620e4c8af40bad752d369e9108508e54.tar.gz kolla-51e94df0620e4c8af40bad752d369e9108508e54.zip | |
Merge "Add netcat package in sahara-engine image"
| -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 %} |