diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-02-03 11:35:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-02-03 11:35:55 +0000 |
| commit | 1a683873d63f9b354b8feae832d650115fcdf661 (patch) | |
| tree | d74524dac6e855eafb045df4b85fe63f1be3e20a /docker | |
| parent | 6aef71e092206ca6b6bcb2ea6e57a6914e720ff5 (diff) | |
| parent | aae9193675ed214f7a4455708409532ea1665255 (diff) | |
| download | kolla-1a683873d63f9b354b8feae832d650115fcdf661.tar.gz kolla-1a683873d63f9b354b8feae832d650115fcdf661.zip | |
Merge "Containerized sshd does not work with older PAM"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 5b5287981..3848e801d 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -22,6 +22,8 @@ RUN mkdir -p /var/run/sshd \ {% endif %} {{ macros.install_packages(keystone_ssh_packages | customizable("packages")) }} +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 diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index 2ec3b5a5b..3b4ded412 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -18,7 +18,8 @@ RUN mkdir -p /var/run/sshd \ {{ macros.install_packages(nova_ssh_packages | customizable("packages")) }} -RUN chsh -s /bin/bash nova +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 COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start |