From fa3e5f444ab49b12b8abb4779ea7fdf330983f17 Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Mon, 8 Jan 2024 22:39:33 +0100
Subject: [PATCH] Stop removing missing /run/nologin in RPM images

This code was valid for centos:8 and centos:stream8, but is not required
for centos:stream9 or rockylinux:9 which do not include this file.

Change-Id: I50f78d73afe0944dd91998ab9799fa2f36cc46a3
---
 docker/haproxy/haproxy-ssh/Dockerfile.j2   | 4 ----
 docker/keystone/keystone-ssh/Dockerfile.j2 | 4 ----
 docker/nova/nova-ssh/Dockerfile.j2         | 8 +-------
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/docker/haproxy/haproxy-ssh/Dockerfile.j2 b/docker/haproxy/haproxy-ssh/Dockerfile.j2
index b8277a237b..98a083f5a9 100644
--- a/docker/haproxy/haproxy-ssh/Dockerfile.j2
+++ b/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',
diff --git a/docker/keystone/keystone-ssh/Dockerfile.j2 b/docker/keystone/keystone-ssh/Dockerfile.j2
index 3a44ba2ef2..6e59d8fa85 100644
--- a/docker/keystone/keystone-ssh/Dockerfile.j2
+++ b/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',
diff --git a/docker/nova/nova-ssh/Dockerfile.j2 b/docker/nova/nova-ssh/Dockerfile.j2
index 945e9489da..605fa98837 100644
--- a/docker/nova/nova-ssh/Dockerfile.j2
+++ b/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