diff options
| author | Mohammed Naser <mnaser@vexxhost.com> | 2017-03-14 20:09:58 -0400 |
|---|---|---|
| committer | Mohammed Naser <mnaser@vexxhost.com> | 2017-03-15 14:24:39 -0400 |
| commit | b68bdabbb45c3be69ec7d6ee3f93b9cdbb95c4a0 (patch) | |
| tree | f5d287fea68fd45c6e4d495003303c2c68e57fb1 /docker/nova | |
| parent | 6d1f01b100cb39cc1ce01ea6895a509a8fecf07a (diff) | |
| download | kolla-b68bdabbb45c3be69ec7d6ee3f93b9cdbb95c4a0.tar.gz kolla-b68bdabbb45c3be69ec7d6ee3f93b9cdbb95c4a0.zip | |
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
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 5 |
1 files changed, 3 insertions, 2 deletions
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 |