From: Sage Weil <sage@redhat.com>
Date: Wed, 18 Mar 2020 15:12:59 +0000 (-0500)
Subject: qa/workunits/cephadm/test_cephadm: mark services unmanaged for test
X-Git-Tag: v15.2.0~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=acbda9d19d75e45ee30bd1ea6de6f5bd561dbf19;p=ceph.git

qa/workunits/cephadm/test_cephadm: mark services unmanaged for test

We are deploying containers manually.  Mark them unmanaged so that we
do not fight against mgr/cephadm cleaning up orphan daemons.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index a1320e030710..b6c6cad306cf 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -214,6 +214,11 @@ systemctl | grep system-ceph | grep -q .slice  # naming is escaped and annoying
 $CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
       ceph -s | grep $FSID
 
+for t in mon mgr node-exporter prometheus grafana; do
+    $CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
+	     ceph orch apply $t --unmanaged
+done
+
 ## ls
 $CEPHADM ls | jq '.[]' | jq 'select(.name == "mon.a").fsid' \
     | grep $FSID
@@ -302,6 +307,8 @@ $CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
         ceph osd pool create $nfs_rados_pool 64
 $CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
         rados --pool nfs-ganesha --namespace nfs-ns create conf-nfs.a
+$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
+	 ceph orch pause
 $CEPHADM deploy --name nfs.a \
       --fsid $FSID \
       --keyring $KEYRING \
@@ -309,6 +316,8 @@ $CEPHADM deploy --name nfs.a \
       --config-json ${CEPHADM_SAMPLES_DIR}/nfs.json
 cond="$SUDO ss -tlnp '( sport = :nfs )' | grep 'ganesha.nfsd'"
 is_available "nfs" "$cond" 10
+$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
+	 ceph orch resume
 
 ## run
 # WRITE ME