qa/tasks/ceph.py: introduce crimson_compat

In an attempt to use the default flavor for both crimson and classic,
we can no longer rely on flavors to enable crimson flags.
The existing CRIMSON_COMPAT env variable is defined under "workunit",
and is not supported by tasks/ceph. Instead, introduce, a dedicated
crimson_compat option supported by tasks/ceph.

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

diff --git a/qa/config/crimson_qa_overrides.yaml b/qa/config/crimson_qa_overrides.yaml
index ce2a0aeeb9d997d5d3d3981f64cb02e765575f42..c0edf21f15e59e31b4ef38c33bb901f88b08cd09 100644 (file)
--- a/qa/config/crimson_qa_overrides.yaml
+++ b/qa/config/crimson_qa_overrides.yaml
@@ -12,6 +12,7 @@ overrides:
         debug ms: 20
         seastore cachepin size pershard: 64M
         seastore max concurrent transactions: 8
+    crimson_compat: true
   workunit:
     env:
       CRIMSON_COMPAT: '1'

diff --git a/qa/tasks/ceph.py b/qa/tasks/ceph.py
index 1c14194703b6f2785b8450fb98ac4a4a844a748c..d4801c9b4ed86a50471ace1dbbf51cfc901e80a4 100644 (file)
--- a/qa/tasks/ceph.py
+++ b/qa/tasks/ceph.py
@@ -667,9 +667,7 @@ def create_simple_monmap(ctx, remote, conf, mons,
 
 
 def is_crimson(config):
-    return config.get('flavor', 'default') == 'crimson-debug' or \
-        config.get('flavor', 'default') == 'crimson-release'
-
+    return config.get('crimson_compat', False)
 
 def maybe_redirect_stderr(config, type_, args, log_path):
     if type_ == 'osd' and is_crimson(config):