From 28593dbf1caeeec8f7c69dbd06e2ff9759afd072 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Mon, 23 Oct 2017 09:20:26 -0400 Subject: [PATCH] ceph-volume lvm.activate safeguard against auto detect objectstore flag not being set Signed-off-by: Alfredo Deza (cherry picked from commit c9b5f352a8f9e2743e5dca3a0479c8099a59fd12) --- src/ceph-volume/ceph_volume/devices/lvm/activate.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py index dc958fe39dd35..b41d508e4d617 100644 --- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py +++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py @@ -137,7 +137,9 @@ class Activate(object): lvs.filter(lv_tags={'ceph.osd_fsid': args.osd_fsid}) if not lvs: raise RuntimeError('could not find osd.%s with fsid %s' % (args.osd_id, args.osd_fsid)) - if args.auto_detect_objectstore: + # This argument is only available when passed in directly or via + # systemd, not when ``create`` is being used + if getattr(args, 'auto_detect_objectstore', False): logger.info('auto detecting objectstore') # may get multiple lvs, so can't do lvs.get() calls here for lv in lvs: -- 2.39.5