Skip to content

Commit e194cca

Browse files
committed
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 <[email protected]>
1 parent 08c334b commit e194cca

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

qa/config/crimson_qa_overrides.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ overrides:
1212
debug ms: 20
1313
seastore cachepin size pershard: 64M
1414
seastore max concurrent transactions: 8
15+
crimson_compat: true
1516
workunit:
1617
env:
1718
CRIMSON_COMPAT: '1'

qa/tasks/ceph.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -667,9 +667,7 @@ def create_simple_monmap(ctx, remote, conf, mons,
667667

668668

669669
def is_crimson(config):
670-
return config.get('flavor', 'default') == 'crimson-debug' or \
671-
config.get('flavor', 'default') == 'crimson-release'
672-
670+
return config.get('crimson_compat', False)
673671

674672
def maybe_redirect_stderr(config, type_, args, log_path):
675673
if type_ == 'osd' and is_crimson(config):

0 commit comments

Comments
 (0)