From: Michael Fritch <mfritch@suse.com>
Date: Thu, 19 Mar 2020 19:43:56 +0000 (-0600)
Subject: qa/workunits/cephadm/test_cephadm.sh: fix mon.b failure
X-Git-Tag: v15.2.1~42^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=84d0c8e434f2fd581dfa62b563c433cf61498709;p=ceph.git

qa/workunits/cephadm/test_cephadm.sh: fix mon.b failure

and is_available check to ensure quorum

Signed-off-by: Michael Fritch <mfritch@suse.com>
(cherry picked from commit 90cb2feec3165817f5041a6bdc26aa0073a90e00)
---

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index b6c6cad306cf..699088238238 100755
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -231,15 +231,18 @@ $CEPHADM ls | jq '.[]' | jq 'select(.name == "mon.a").version' | grep -q \\.
 ## deploy
 # add mon.b
 cp $CONFIG $MONCONFIG
-echo "public addr = $IP:3301" >> $MONCONFIG
+echo "public addrv = [v2:$IP:3301,v1:$IP:6790]" >> $MONCONFIG
 $CEPHADM deploy --name mon.b \
       --fsid $FSID \
       --keyring /var/lib/ceph/$FSID/mon.a/keyring \
-      --config $CONFIG
+      --config $MONCONFIG
 for u in ceph-$FSID@mon.b; do
     systemctl is-enabled $u
     systemctl is-active $u
 done
+cond="$CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \
+	    ceph mon stat | grep '2 mons'"
+is_available "mon.b" "$cond" 30
 
 # add mgr.y
 $CEPHADM shell --fsid $FSID --config $CONFIG --keyring $KEYRING -- \