From a614a43bebf51aa63de10dfebfa342dc8d44f491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Castillo=20Alc=C3=ADbar?= Date: Wed, 22 Feb 2017 11:46:23 +0100 Subject: [PATCH] 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 --- docker/sahara/sahara-base/Dockerfile.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker/sahara/sahara-base/Dockerfile.j2 b/docker/sahara/sahara-base/Dockerfile.j2 index ae7efe6693..e0104cabd5 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 = [