diff options
| author | Javier Castillo Alcíbar <javier.castillo.alcibar@gmail.com> | 2017-02-22 11:46:23 +0100 |
|---|---|---|
| committer | Javier Castillo Alcíbar <javier.castillo.alcibar@gmail.com> | 2017-03-10 08:22:15 +0100 |
| commit | a614a43bebf51aa63de10dfebfa342dc8d44f491 (patch) | |
| tree | e11693011a7289784973e0bd45f6419b95ea1ea1 /docker | |
| parent | 1fbe35815cf83b48d5ffda246ee7aff39931bce6 (diff) | |
| download | kolla-a614a43bebf51aa63de10dfebfa342dc8d44f491.tar.gz kolla-a614a43bebf51aa63de10dfebfa342dc8d44f491.zip | |
Sahara needs to run ssh-keygen
In order to generate keypair and access to cluster instances,
sahara-base container must include this binary, even when we
deploy based on source type.
Change-Id: I40747bceba3fede66864b781df1da1034ea22d11
Closes-Bug: #1665293
Diffstat (limited to 'docker')
| -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 = [ |