From b68bdabbb45c3be69ec7d6ee3f93b9cdbb95c4a0 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Tue, 14 Mar 2017 20:09:58 -0400 Subject: Refactor and enable shell access When installing from binary, packaging tools create a user for Keystone which does not have a shell. This results in fernet token operations failing due to the fact that `rsync` cannot connect over SSH because the Keystone user cannot login. This patch addresses this issue by enabling shell access to the Keystone user, it also refactors the Nova SSH controller to use the pre-existing macro. Change-Id: Ic753a94311c5d7d72a82d91c1279dfe982e9afbd Related-Bug: #1617902 --- docker/nova/nova-ssh/Dockerfile.j2 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docker/nova/nova-ssh') diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index 98bee70f1..f54f4cdc6 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='nova', shell='/bin/bash') }} + {% set nova_ssh_packages = [ 'openssh-server' ] %} @@ -18,8 +20,7 @@ RUN mkdir -p /var/run/sshd \ {{ macros.install_packages(nova_ssh_packages | customizable("packages")) }} -RUN chsh -s /bin/bash nova \ - && sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd +RUN sed -ri 's/session(\s+)required(\s+)pam_loginuid.so/session\1optional\2pam_loginuid.so/' /etc/pam.d/sshd COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start -- cgit v1.2.3