From 5460ec1e9b50f2ec0abb132b3e093e783ad9fee6 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Sat, 18 Mar 2017 14:02:13 -0400 Subject: [PATCH] Turn on SSH for Keystone for all distros. With the previous patch that was done to enable SSH access, it was mistakingly done to be handled only in the Ubuntu case. It should always be done as SSH is always needed. This is only a problem for the backport, the change introduced in master and stable/ocata relies on the new configure_user macro which runs regardless. Change-Id: Ibef580748cc139f0ebf207609f934f1469222624 Closes-Bug: #1635795 --- docker/keystone/keystone-ssh/Dockerfile.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 1bb4aab92c..dcea1a1907 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -17,14 +17,14 @@ MAINTAINER {{ maintainer }} ] %} RUN mkdir -p /var/run/sshd \ - && chmod 0755 /var/run/sshd \ - && chsh -s /bin/bash keystone + && chmod 0755 /var/run/sshd {% endif %} {{ macros.install_packages(keystone_ssh_packages | customizable("packages")) }} COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start +RUN chsh -s /bin/bash keystone \ + && chmod 755 /usr/local/bin/kolla_extend_start {% block keystone_ssh_footer %}{% endblock %} {% block footer %}{% endblock %}