Merge "Stop removing missing /run/nologin in RPM images"

Author: Zuul

docker/haproxy/haproxy-ssh/Dockerfile.j2

@@ -16,10 +16,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'rsync',
     ] %}
 
-# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
-# prevents SSH access to it.
-RUN rm -f /run/nologin
-
 {% elif base_package_type == 'deb' %}
     {% set haproxy_ssh_packages = [
         'openssh-server',

docker/keystone/keystone-ssh/Dockerfile.j2

@@ -15,10 +15,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'rsync'
     ] %}
 
-# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
-# prevents SSH access to it.
-RUN rm -f /run/nologin
-
 {% elif base_package_type == 'deb' %}
     {% set keystone_ssh_packages = [
         'openssh-server',

docker/nova/nova-ssh/Dockerfile.j2

@@ -13,13 +13,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     'openssh-server'
 ] %}
 
-{% if base_package_type == 'rpm' %}
-
-# NOTE(mgoddard): The centos:8 image contains a /run/nologin file, which
-# prevents SSH access to it.
-RUN rm -f /run/nologin
-
-{% elif base_package_type == 'deb' %}
+{% if base_package_type == 'deb' %}
 
 RUN mkdir -p /var/run/sshd \
     && chmod 0755 /var/run/sshd