From: Zack Cerza <zack@redhat.com>
Date: Wed, 3 Aug 2022 18:11:46 +0000 (-0600)
Subject: containers/testnode: Use systemd
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=457c8d7c92527663655b7b0b9504d173b1d7221a;p=teuthology.git

containers/testnode: Use systemd

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/containers/testnode/Dockerfile b/containers/testnode/Dockerfile
index 07670ae37f..a7742053d5 100644
--- a/containers/testnode/Dockerfile
+++ b/containers/testnode/Dockerfile
@@ -36,12 +36,16 @@ RUN dnf -y install \
     openssh-server \
     hostname \
     python3-pip \
-    httpd
+    httpd \
+    systemd && \
+    systemctl enable sshd
 RUN dnf clean all && \
     rm -rf /var/cache /var/log/dnf* /var/log/yum*
 COPY testnode_start.sh /
 COPY testnode_stop.sh /
 COPY testnode_sudoers /etc/sudoers.d/teuthology
+COPY run-fs.service /etc/systemd/system/
+RUN systemctl enable run-fs
 RUN \
     ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N '' && \
     sed -i 's/#PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config && \
diff --git a/containers/testnode/run-fs.service b/containers/testnode/run-fs.service
new file mode 100644
index 0000000000..f287e275a8
--- /dev/null
+++ b/containers/testnode/run-fs.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Ensure required items in /run/ are present
+
+[Service]
+Type=oneshot
+RemainAfterExit=true
+ExecStartPre=mkdir -p run/udev
+ExecStartPre=mkdir -p run/sshd
+ExecStartPre=touch /run/.containerenv /.dockerenv
+ExecStart=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/containers/testnode/testnode_start.sh b/containers/testnode/testnode_start.sh
index d3e208e206..de69169d9e 100755
--- a/containers/testnode/testnode_start.sh
+++ b/containers/testnode/testnode_start.sh
@@ -10,4 +10,4 @@ for i in $(seq 1 5); do
     sleep 1
 done
 mkdir -p /run/sshd
-exec /usr/sbin/sshd -D
+exec /usr/lib/systemd/systemd --system