qa/suites: Fix crimson flavor configuration

Signed-off-by: Matan Breizman <[email protected]>
sarvex · Jan 6, 2022 · 3dad67c · 3dad67c
1 parent c1c7d3b
commit 3dad67c
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 12 deletions.
diff --git a/qa/suites/crimson-rados/basic/ceph.yaml → ...ites/crimson-rados/basic/deploy/ceph.yaml b/qa/suites/crimson-rados/basic/ceph.yaml → ...ites/crimson-rados/basic/deploy/ceph.yaml
@@ -1,16 +1,18 @@
 overrides:
-  ceph:
+  install:
+    ceph:
+      flavor: crimson
+tasks:
+- install:
+- ceph:
     conf:
+      osd:
+        debug monc: 20
       mon:
         mon min osdmap epochs: 50
         paxos service trim min: 10
         # prune full osdmaps regularly
         mon osdmap full prune min: 15
         mon osdmap full prune interval: 2
         mon osdmap full prune txsize: 2
-tasks:
-- install:
-    ceph:
-      flavor: crimson
-- ceph:
     flavor: crimson
diff --git a/qa/suites/crimson-rados/basic/deploy/cephadm.yaml.disabled b/qa/suites/crimson-rados/basic/deploy/cephadm.yaml.disabled
@@ -0,0 +1,16 @@
+# no need to verify os + flavor + sha1
+verify_ceph_hash: false
+tasks:
+- cephadm:
+    conf:
+      mgr:
+        debug ms: 1
+        debug mgr: 20
+        debug osd: 10
+- cephadm.shell:
+    mon.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls
diff --git a/qa/suites/crimson-rados/rbd/ceph.yaml → qa/suites/crimson-rados/rbd/deploy/ceph.yaml b/qa/suites/crimson-rados/rbd/ceph.yaml → qa/suites/crimson-rados/rbd/deploy/ceph.yaml
@@ -1,16 +1,18 @@
 overrides:
-  ceph:
+  install:
+    ceph:
+      flavor: crimson
+tasks:
+- install:
+- ceph:
     conf:
+      osd:
+        debug monc: 20
       mon:
         mon min osdmap epochs: 50
         paxos service trim min: 10
         # prune full osdmaps regularly
         mon osdmap full prune min: 15
         mon osdmap full prune interval: 2
         mon osdmap full prune txsize: 2
-tasks:
-- install:
-    ceph:
-      flavor: crimson
-- ceph:
     flavor: crimson
diff --git a/qa/suites/crimson-rados/rbd/deploy/cephadm.yaml.disabled b/qa/suites/crimson-rados/rbd/deploy/cephadm.yaml.disabled
@@ -0,0 +1,16 @@
+# no need to verify os + flavor + sha1
+verify_ceph_hash: false
+tasks:
+- cephadm:
+    conf:
+      mgr:
+        debug ms: 1
+        debug mgr: 20
+        debug osd: 10
+- cephadm.shell:
+    mon.a:
+      - ceph orch status
+      - ceph orch ps
+      - ceph orch ls
+      - ceph orch host ls
+      - ceph orch device ls