openstack
/
kolla
Code Issues Proposed changes

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
(cherry picked from commit a614a43beb)
This commit is contained in:
Javier Castillo Alcíbar 2017-02-22 11:46:23 +01:00 committed by zhubingbing
parent b8902cbfd2
commit 6f5ec7792d
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/sahara/sahara-base/Dockerfile.j2
View File

@ -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
RUN ln -s sahara-base-source/* sahara \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /sahara \