aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorMatthew Taylor <matthew.taylor@digitalpacific.com.au>2016-08-29 16:53:27 +1000
committerMatthew Taylor <matt@mty.net.au>2016-08-31 14:55:25 +1000
commitc4be56c1e54adb9f1cc6346f1d8849657b0a44ae (patch)
tree6ab0837c54a7f8266594ef41cd72cafca9973dfd /docker
parent57d3eaf70c315bd665a4533f766dbe4a2e6077f9 (diff)
downloadkolla-c4be56c1e54adb9f1cc6346f1d8849657b0a44ae.tar.gz
kolla-c4be56c1e54adb9f1cc6346f1d8849657b0a44ae.zip
Fix nova_ssh container shell to allow instance resizes.
According to the configuration reference, http://docs.openstack.org/mitaka/config-reference/compute/resize.html When using KVM, nova utilizes SSH for instance resizing. Kolla nova_ssh container has the nova user configured with "/sbin/nologin" shell, which prevents nova_compute from successfully resizing instances. Added fix to change shell from nologin to bash. Change-Id: I46a48e242dae6ee6c9159bc30edd8b823ffbb515 Closes-Bug: 1617902
Diffstat (limited to 'docker')
-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