From 3dad67c9d2a81a604c3b1c32e4268f8fbaa3a857 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Thu, 6 Jan 2022 13:32:33 +0000 Subject: [PATCH] qa/suites: Fix crimson flavor configuration Signed-off-by: Matan Breizman --- .../crimson-rados/basic/{ => deploy}/ceph.yaml | 14 ++++++++------ .../basic/deploy/cephadm.yaml.disabled | 16 ++++++++++++++++ .../crimson-rados/rbd/{ => deploy}/ceph.yaml | 14 ++++++++------ .../rbd/deploy/cephadm.yaml.disabled | 16 ++++++++++++++++ 4 files changed, 48 insertions(+), 12 deletions(-) rename qa/suites/crimson-rados/basic/{ => deploy}/ceph.yaml (88%) create mode 100644 qa/suites/crimson-rados/basic/deploy/cephadm.yaml.disabled rename qa/suites/crimson-rados/rbd/{ => deploy}/ceph.yaml (88%) create mode 100644 qa/suites/crimson-rados/rbd/deploy/cephadm.yaml.disabled diff --git a/qa/suites/crimson-rados/basic/ceph.yaml b/qa/suites/crimson-rados/basic/deploy/ceph.yaml similarity index 88% rename from qa/suites/crimson-rados/basic/ceph.yaml rename to qa/suites/crimson-rados/basic/deploy/ceph.yaml index 146f2479a1f9..c22f08eecf8d 100644 --- a/qa/suites/crimson-rados/basic/ceph.yaml +++ b/qa/suites/crimson-rados/basic/deploy/ceph.yaml @@ -1,6 +1,13 @@ 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 @@ -8,9 +15,4 @@ overrides: 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 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/deploy/ceph.yaml similarity index 88% rename from qa/suites/crimson-rados/rbd/ceph.yaml rename to qa/suites/crimson-rados/rbd/deploy/ceph.yaml index 146f2479a1f9..c22f08eecf8d 100644 --- a/qa/suites/crimson-rados/rbd/ceph.yaml +++ b/qa/suites/crimson-rados/rbd/deploy/ceph.yaml @@ -1,6 +1,13 @@ 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 @@ -8,9 +15,4 @@ overrides: 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 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 -- 2.47.3