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>
(cherry picked from commit 1991faaafe6e450896377bb69c04fbce84b1f989)

diff --git a/qa/suites/rados/multimon/clusters/21.yaml b/qa/suites/rados/multimon/clusters/21.yaml
index b6d04a022d809429d48ab0d5adc65481461f8a23..aae96866586f30f4751b1e9b26f922f53633b8da 100644 (file)
--- 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 7b8c62645dddb7a7e23e51c631bddd3f826aad08..11adef16bb65eb7e457e6536482e828afc020719 100644 (file)
--- 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 715cbe855ae367828bace35249b5aed327de0c97..29c74dc7f324adce8174b17383ed2cba0e8cedba 100644 (file)
--- 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 d029c4c594daf3987562f52bcdacb1f1053c91b9..d51168556b7a79303cf762b280de430a027315a5 100644 (file)
--- 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