diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-13 10:01:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-13 10:01:28 +0000 |
| commit | ae40ec099fba83efced09c3f67431f719e0aafd8 (patch) | |
| tree | c9220a7efec24cf51b692004bf100ae97281dec7 | |
| parent | 8d37c9fe3500627684225a00aa8a94446c78eec3 (diff) | |
| parent | a614a43bebf51aa63de10dfebfa342dc8d44f491 (diff) | |
| download | kolla-ae40ec099fba83efced09c3f67431f719e0aafd8.tar.gz kolla-ae40ec099fba83efced09c3f67431f719e0aafd8.zip | |
Merge "Sahara needs to run ssh-keygen"
| -rw-r--r-- | docker/sahara/sahara-base/Dockerfile.j2 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2 index ae7efe669..e0104cabd 100644 --- a/docker/sahara/sahara-base/Dockerfile.j2 +++ b/docker/sahara/sahara-base/Dockerfile.j2 @@ -18,6 +18,13 @@ MAINTAINER {{ maintainer }} {% elif install_type == 'source' %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set sahara_base_packages = ['openssh'] %} +{% elif base_distro in ['ubuntu'] %} + {% set sahara_base_packages = ['openssh-client'] %} +{% endif %} +{{ macros.install_packages(sahara_base_packages | customizable("packages")) }} + ADD sahara-base-archive /sahara-base-source {% set sahara_base_pip_packages = [ |