diff options
| author | Zuul <zuul@review.opendev.org> | 2020-02-01 15:43:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-02-01 15:43:39 +0000 |
| commit | a0058693f192d866a54a21137424b9a67ae8ef4c (patch) | |
| tree | 96532b0a8e7f871adc082d6a4a4edbb53e0cfa63 | |
| parent | adcdef7d85b4d1a89592f01ae4902b43b768f0d3 (diff) | |
| parent | 892ae92d971fd7a2c8d39e416512bb69f7fd833f (diff) | |
| download | kolla-a0058693f192d866a54a21137424b9a67ae8ef4c.tar.gz kolla-a0058693f192d866a54a21137424b9a67ae8ef4c.zip | |
Merge "CentOS 8: Allow SSH access to keystone_ssh and nova_ssh"
| -rw-r--r-- | docker/keystone/keystone-ssh/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/nova/nova-ssh/Dockerfile.j2 | 10 |
2 files changed, 16 insertions, 1 deletions
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2 index 233dedf7c..442f2df9d 100644 --- a/docker/keystone/keystone-ssh/Dockerfile.j2 +++ b/docker/keystone/keystone-ssh/Dockerfile.j2 @@ -12,6 +12,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssh-server', 'rsync' ] %} + +{% if distro_package_manager == 'dnf' %} +# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which +# prevents SSH access to it. +RUN rm -f /run/nologin +{% endif %} + {% elif base_package_type == 'deb' %} {% set keystone_ssh_packages = [ 'openssh-server', diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2 index a032cb6e7..3d0ebd04d 100644 --- a/docker/nova/nova-ssh/Dockerfile.j2 +++ b/docker/nova/nova-ssh/Dockerfile.j2 @@ -11,7 +11,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openssh-server' ] %} -{% if base_package_type == 'deb' %} +{% if base_package_type == 'rpm' %} + +{% if distro_package_manager == 'dnf' %} +# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which +# prevents SSH access to it. +RUN rm -f /run/nologin +{% endif %} + +{% elif base_package_type == 'deb' %} RUN mkdir -p /var/run/sshd \ && chmod 0755 /var/run/sshd |