diff options
| author | Christian Berendt <berendt@betacloud-solutions.de> | 2016-09-13 14:27:15 +0200 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-10-12 16:29:34 +0000 |
| commit | bedca5b35e8f9336182d5588d5650c1bb0682702 (patch) | |
| tree | a9b657fd6f5963da664cbbabab0df1762911e9d2 /docker/keystone/keystone-ssh | |
| parent | 40e768ec2a370dc010be773af37e2ce417adda80 (diff) | |
| download | kolla-bedca5b35e8f9336182d5588d5650c1bb0682702.tar.gz kolla-bedca5b35e8f9336182d5588d5650c1bb0682702.zip | |
Fix keystone fernet file exchange via ssh
* install openssh client in keystone-fernet container
* install rsync in keystone-ssh container
* fix syntax issue in ssh configuration
* copy ssh configuration into keystone-fernet container
* copy id_rsa.pub into keystone-ssh container
* copy id_rsa into keystone-fernet container
* use full path to ssh binary in used scripts
* add missing newlines at EOF
* when using type source set /var/lib/keystone as home
directory for the user keystone
Co-Authored-By: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Change-Id: Id6b41030056a69f6516a054beb2fc0e08226e876
Closes-bug: #1623013
Diffstat (limited to 'docker/keystone/keystone-ssh')
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index cf3e90851..92fa41255 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -6,9 +6,15 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - {% set keystone_ssh_packages = ['openssh-server'] %} + {% set keystone_ssh_packages = [ + 'openssh-server', + 'rsync' + ] %} {% elif base_distro in ['ubuntu', 'debian'] %} - {% set keystone_ssh_packages = ['openssh-server'] %} + {% set keystone_ssh_packages = [ + 'openssh-server', + 'rsync' + ] %} RUN mkdir -p /var/run/sshd \ && chmod 0755 /var/run/sshd |