diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-03-16 00:25:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-03-16 00:25:59 +0000 |
| commit | cf6883b82b9b14a440aa748319430f6f424c2293 (patch) | |
| tree | 260d09f362622e35d47fcb399b7a29e26c57a136 /docker | |
| parent | 6643beb1421dbd631729525af72dd7fca5258486 (diff) | |
| parent | b68bdabbb45c3be69ec7d6ee3f93b9cdbb95c4a0 (diff) | |
| download | kolla-cf6883b82b9b14a440aa748319430f6f424c2293.tar.gz kolla-cf6883b82b9b14a440aa748319430f6f424c2293.zip | |
Merge "Refactor and enable shell access"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 51314cdc8..2f919fe9c 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -5,6 +5,8 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +{{ macros.configure_user(name='keystone', shell='/bin/bash') }} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set keystone_ssh_packages = [ 'openssh-server', 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 |