From: Adam King <adking@redhat.com>
Date: Mon, 30 Jan 2023 16:27:09 +0000 (-0500)
Subject: qa/cephadm: add check that iscsi daemon /etc/hosts matches host /etc/hosts
X-Git-Tag: v16.2.14~176^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6e76306ce7a657c17ae838343636ed1be04c4e23;p=ceph.git

qa/cephadm: add check that iscsi daemon /etc/hosts matches host /etc/hosts

To make sure we aren't being affected by any podman introduced
changes to the /etc/hosts file and test that we're properly
mounting /etc/hosts in our daemon containers

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 5493e2d3300c115795987d6f63134af2437e83fc)

Conflicts:
	qa/suites/orch/cephadm/dashboard/0-distro/centos_8.stream_container_tools.yaml
	qa/suites/orch/cephadm/thrash-old-clients/0-size-min-size-overrides/.qa
	qa/suites/orch/cephadm/workunits/task/test_iscsi_container/.qa
	qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml
	qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml
	qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit.yaml
	qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/.qa
	qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/centos_8.stream_container_tools.yaml
	qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit/test_iscsi_pids_limit.yaml
	   (due to test_iscsi_pids_limit not backported)
---

diff --git a/qa/suites/orch/cephadm/workunits/task/.qa b/qa/suites/orch/cephadm/workunits/task/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/orch/cephadm/workunits/task/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/+ b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/+
new file mode 100644
index 0000000000000..e69de29bb2d1d
diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/.qa b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/.qa
new file mode 120000
index 0000000000000..a602a0353e751
--- /dev/null
+++ b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/.qa
@@ -0,0 +1 @@
+../.qa/
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml
new file mode 120000
index 0000000000000..7a86f967f0203
--- /dev/null
+++ b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/centos_8.stream_container_tools.yaml
@@ -0,0 +1 @@
+.qa/distros/podman/centos_8.stream_container_tools.yaml
\ No newline at end of file
diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml
new file mode 100644
index 0000000000000..19d302c87deb7
--- /dev/null
+++ b/qa/suites/orch/cephadm/workunits/task/test_iscsi_container/test_iscsi_container.yaml
@@ -0,0 +1,21 @@
+roles:
+- - host.a
+  - osd.0
+  - osd.1
+  - osd.2
+  - mon.a
+  - mgr.a
+  - client.0
+tasks:
+- install:
+- cephadm:
+- cephadm.shell:
+    host.a:
+      - ceph osd pool create foo
+      - rbd pool init foo
+      - ceph orch apply iscsi foo u p
+- workunit:
+    clients:
+      client.0:
+        - cephadm/test_iscsi_pids_limit.sh
+        - cephadm/test_iscsi_etc_hosts.sh
diff --git a/qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit.yaml b/qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit.yaml
deleted file mode 100644
index b271777e1874a..0000000000000
--- a/qa/suites/orch/cephadm/workunits/task/test_iscsi_pids_limit.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-roles:
-- - host.a
-  - osd.0
-  - osd.1
-  - osd.2
-  - mon.a
-  - mgr.a
-  - client.0
-tasks:
-- install:
-- cephadm:
-- cephadm.shell:
-    host.a:
-      - ceph osd pool create foo
-      - rbd pool init foo
-      - ceph orch apply iscsi foo u p
-- workunit:
-    clients:
-      client.0:
-        - cephadm/test_iscsi_pids_limit.sh
diff --git a/qa/workunits/cephadm/test_iscsi_etc_hosts.sh b/qa/workunits/cephadm/test_iscsi_etc_hosts.sh
new file mode 100755
index 0000000000000..adbc34a926a7c
--- /dev/null
+++ b/qa/workunits/cephadm/test_iscsi_etc_hosts.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# checks if the container and host's /etc/hosts files match
+# Necessary to avoid potential bugs caused by podman making
+# edits to /etc/hosts file in the container
+# exits with code 1 if host and iscsi container /etc/hosts do no match
+
+set -ex
+
+ISCSI_DAEMON=$(sudo /home/ubuntu/cephtest/cephadm ls | jq -r '.[] | select(.service_name == "iscsi.foo") | .name')
+sudo /home/ubuntu/cephtest/cephadm enter --name $ISCSI_DAEMON -- cat /etc/hosts > iscsi_daemon_etc_hosts.txt
+if cmp --silent /etc/hosts iscsi_daemon_etc_hosts.txt; then
+  echo "Daemon and host /etc/hosts files successfully matched"
+else
+  echo "ERROR: /etc/hosts on host did not match /etc/hosts in the iscsi container!"
+  echo "Host /etc/hosts:"
+  cat /etc/hosts
+  echo "Iscsi container /etc/hosts:"
+  cat iscsi_daemon_etc_hosts.txt
+  exit 1
+fi