summaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-31 12:49:16 +0000
committerGerrit Code Review <review@openstack.org>2016-08-31 12:49:16 +0000
commit7feed607f263175cfc38ec5ba2b8629570ba433b (patch)
tree74a79371d1d03497c84928b0795a4b038a9f939b /docker/nova
parent970eff43f3fd083ff00702d5443e8bfb5c81fee8 (diff)
parentc4be56c1e54adb9f1cc6346f1d8849657b0a44ae (diff)
downloadkolla-7feed607f263175cfc38ec5ba2b8629570ba433b.tar.gz
kolla-7feed607f263175cfc38ec5ba2b8629570ba433b.zip
Merge "Fix nova_ssh container shell to allow instance resizes."
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-ssh/Dockerfile.j22
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2
index d3a433d5c..08041a573 100644
--- a/docker/nova/nova-ssh/Dockerfile.j2
+++ b/docker/nova/nova-ssh/Dockerfile.j2
@@ -16,6 +16,8 @@ RUN mkdir -p /var/run/sshd \
{{ macros.install_packages(nova_ssh_packages | customizable("packages")) }}
+RUN chsh -s /bin/bash nova
+
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start