From 101c810a80eea14ab2a1edc8166dbbe76cd9e87a Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 12 Aug 2021 11:12:59 -0400 Subject: [PATCH] ceph-volume: activate: try simple mode too This is of dubious value to cephadm since /etc/ceph/osd/* won't be populated inside of a conatiner. However, it makes sense from a purely ceph-volume perspective. Signed-off-by: Sage Weil --- src/ceph-volume/ceph_volume/activate/main.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/ceph-volume/ceph_volume/activate/main.py b/src/ceph-volume/ceph_volume/activate/main.py index 40690c5d97603..1f8144ab2c501 100644 --- a/src/ceph-volume/ceph_volume/activate/main.py +++ b/src/ceph-volume/ceph_volume/activate/main.py @@ -5,6 +5,7 @@ import argparse from ceph_volume import terminal from ceph_volume.devices.lvm.activate import Activate as LVMActivate from ceph_volume.devices.raw.activate import Activate as RAWActivate +from ceph_volume.devices.simple.activate import Activate as SimpleActivate class Activate(object): @@ -70,4 +71,17 @@ class Activate(object): except Exception as e: terminal.info(f'Failed to activate via lvm: {e}') + # then try simple + try: + SimpleActivate([]).activate( + argparse.Namespace( + osd_id=self.args.osd_id, + osd_fsid=self.args.osd_uuid, + no_systemd=self.args.no_systemd, + ) + ) + return + except Exception as e: + terminal.info(f'Failed to activate via simple: {e}') + terminal.error('Failed to activate any OSD(s)') -- 2.39.5