From b6a449e2e3241aaa2c0eb8fa9f74b5d939c97852 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Mon, 29 Jul 2019 15:46:48 -0400 Subject: [PATCH] ceph-volume simple.activate better detect bluestore/filestore when type is not found Signed-off-by: Alfredo Deza --- .../ceph_volume/devices/simple/activate.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/simple/activate.py b/src/ceph-volume/ceph_volume/devices/simple/activate.py index 3cf414fdc73..bcc9645d67b 100644 --- a/src/ceph-volume/ceph_volume/devices/simple/activate.py +++ b/src/ceph-volume/ceph_volume/devices/simple/activate.py @@ -35,8 +35,16 @@ class Activate(object): try: objectstore = json_config['type'] except KeyError: - logger.warning('"type" was not defined, will assume "bluestore"') - objectstore = 'bluestore' + if {'data', 'journal'}.issubset(set(devices)): + logger.warning( + '"type" key not found, assuming "filestore" since journal key is present' + ) + objectstore = 'filestore' + else: + logger.warning( + '"type" key not found, assuming "bluestore" since journal key is not present' + ) + objectstore = 'bluestore' # Go through all the device combinations that are absolutely required, # raise an error describing what was expected and what was found -- 2.39.5