From: Sage Weil <sage@redhat.com>
Date: Thu, 30 May 2019 18:05:54 +0000 (-0500)
Subject: qa/suites/rados/multimon: no osds when skewing clock
X-Git-Tag: v15.1.0~2546^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1991faaafe6e450896377bb69c04fbce84b1f989;p=ceph.git

qa/suites/rados/multimon: no osds when skewing clock

Sometimes the clock skew prevents the mon quorum from making progress and
processing the osd boot messages.

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

diff --git a/qa/suites/rados/multimon/clusters/21.yaml b/qa/suites/rados/multimon/clusters/21.yaml
index b6d04a022d80..aae96866586f 100644
--- a/qa/suites/rados/multimon/clusters/21.yaml
+++ b/qa/suites/rados/multimon/clusters/21.yaml
@@ -1,7 +1,7 @@
 roles:
-- [mon.a, mon.d, mon.g, mon.j, mon.m, mon.p, mon.s, osd.0]
+- [mon.a, mon.d, mon.g, mon.j, mon.m, mon.p, mon.s]
 - [mon.b, mon.e, mon.h, mon.k, mon.n, mon.q, mon.t, mgr.x]
-- [mon.c, mon.f, mon.i, mon.l, mon.o, mon.r, mon.u, osd.1]
+- [mon.c, mon.f, mon.i, mon.l, mon.o, mon.r, mon.u]
 openstack:
 - volumes: # attached to each instance
     count: 1
diff --git a/qa/suites/rados/multimon/clusters/3.yaml b/qa/suites/rados/multimon/clusters/3.yaml
index 7b8c62645ddd..11adef16bb65 100644
--- a/qa/suites/rados/multimon/clusters/3.yaml
+++ b/qa/suites/rados/multimon/clusters/3.yaml
@@ -1,6 +1,6 @@
 roles:
-- [mon.a, mon.c, osd.0]
-- [mon.b, mgr.x, osd.1]
+- [mon.a, mon.c]
+- [mon.b, mgr.x]
 openstack:
 - volumes: # attached to each instance
     count: 2
diff --git a/qa/suites/rados/multimon/clusters/6.yaml b/qa/suites/rados/multimon/clusters/6.yaml
index 715cbe855ae3..29c74dc7f324 100644
--- a/qa/suites/rados/multimon/clusters/6.yaml
+++ b/qa/suites/rados/multimon/clusters/6.yaml
@@ -1,6 +1,6 @@
 roles:
-- [mon.a, mon.c, mon.e, mgr.x, osd.0]
-- [mon.b, mon.d, mon.f, mgr.y, osd.1]
+- [mon.a, mon.c, mon.e, mgr.x]
+- [mon.b, mon.d, mon.f, mgr.y]
 openstack:
 - volumes: # attached to each instance
     count: 1
diff --git a/qa/suites/rados/multimon/clusters/9.yaml b/qa/suites/rados/multimon/clusters/9.yaml
index d029c4c594da..d51168556b7a 100644
--- a/qa/suites/rados/multimon/clusters/9.yaml
+++ b/qa/suites/rados/multimon/clusters/9.yaml
@@ -1,7 +1,7 @@
 roles:
-- [mon.a, mon.d, mon.g, osd.0]
+- [mon.a, mon.d, mon.g]
 - [mon.b, mon.e, mon.h, mgr.x]
-- [mon.c, mon.f, mon.i, osd.1]
+- [mon.c, mon.f, mon.i]
 openstack:
 - volumes: # attached to each instance
     count: 1