diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-03-27 00:39:07 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-04-03 07:21:17 +0000 |
| commit | 42420830f65c0a76ba8e7e1b6a8d2974dabb9cfa (patch) | |
| tree | 750a6b81d5809f325e7ca45cc5944b84350dae64 /docker/nova/nova-ssh | |
| parent | 808d6baa448533b7dca98eca728c06d4323de22b (diff) | |
| download | kolla-42420830f65c0a76ba8e7e1b6a8d2974dabb9cfa.tar.gz kolla-42420830f65c0a76ba8e7e1b6a8d2974dabb9cfa.zip | |
Implement nova-ssh container
Add a nova-ssh container to handle the `nova migrate` and
`nova resize` case, in which the nova will use ssh to copy
files between machines.
Change-Id: Ie6675943f3aeabfbba8589d308d55b9c89d732db
Closes-Bug: #1562141
Diffstat (limited to 'docker/nova/nova-ssh')
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 23 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/extend_start.sh | 20 |
2 files changed, 43 insertions, 0 deletions
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 new file mode 100644 index 000000000..7bc859ef1 --- /dev/null +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -0,0 +1,23 @@ +FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install \ + openssh-server \ + && yum clean all + +{% elif base_distro in ['ubuntu', 'debian'] %} + +RUN apt-get install -y --no-install-recommends \ + openssh-server \ + && apt-get clean \ + && mkdir -p /var/run/sshd \ + && chmod 0755 /var/run/sshd + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start + +{{ include_footer }} diff --git a/docker/nova/nova-ssh/extend_start.sh b/docker/nova/nova-ssh/extend_start.sh new file mode 100644 index 000000000..da05e4379 --- /dev/null +++ b/docker/nova/nova-ssh/extend_start.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +if [[ ! -L /dev/log ]]; then + ln -sf /var/lib/kolla/heka/log /dev/log +fi + +SSH_HOST_KEY_TYPES=( "rsa" "dsa" "ecdsa" "ed25519" ) + +for key_type in ${SSH_HOST_KEY_TYPES[@]}; do + KEY_PATH=/etc/ssh/ssh_host_${key_type}_key + if [[ ! -f "${KEY_PATH}" ]]; then + ssh-keygen -q -t ${key_type} -f ${KEY_PATH} -N "" + fi +done + +mkdir -p /var/lib/nova/.ssh + +if [[ $(stat -c %U:%G /var/lib/nova/.ssh) != "nova:nova" ]]; then + chown nova: /var/lib/nova/.ssh +fi |