From: Matan Breizman <mbreizma@redhat.com>
Date: Thu, 6 Jan 2022 13:32:33 +0000 (+0000)
Subject: qa/suites: Fix crimson flavor configuration
X-Git-Tag: v17.1.0~107^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F44495%2Fhead;p=ceph.git

qa/suites: Fix crimson flavor configuration

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/qa/suites/crimson-rados/basic/ceph.yaml b/qa/suites/crimson-rados/basic/ceph.yaml
deleted file mode 100644
index 146f2479a1f9..000000000000
--- a/qa/suites/crimson-rados/basic/ceph.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      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/ceph.yaml b/qa/suites/crimson-rados/basic/deploy/ceph.yaml
new file mode 100644
index 000000000000..c22f08eecf8d
--- /dev/null
+++ b/qa/suites/crimson-rados/basic/deploy/ceph.yaml
@@ -0,0 +1,18 @@
+overrides:
+  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
+    flavor: crimson
diff --git a/qa/suites/crimson-rados/basic/deploy/cephadm.yaml.disabled b/qa/suites/crimson-rados/basic/deploy/cephadm.yaml.disabled
new file mode 100644
index 000000000000..0c2062240ee0
--- /dev/null
+++ 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 b/qa/suites/crimson-rados/rbd/ceph.yaml
deleted file mode 100644
index 146f2479a1f9..000000000000
--- a/qa/suites/crimson-rados/rbd/ceph.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-overrides:
-  ceph:
-    conf:
-      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/ceph.yaml b/qa/suites/crimson-rados/rbd/deploy/ceph.yaml
new file mode 100644
index 000000000000..c22f08eecf8d
--- /dev/null
+++ b/qa/suites/crimson-rados/rbd/deploy/ceph.yaml
@@ -0,0 +1,18 @@
+overrides:
+  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
+    flavor: crimson
diff --git a/qa/suites/crimson-rados/rbd/deploy/cephadm.yaml.disabled b/qa/suites/crimson-rados/rbd/deploy/cephadm.yaml.disabled
new file mode 100644
index 000000000000..0c2062240ee0
--- /dev/null
+++ 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