From: Sage Weil <sage@newdream.net>
Date: Thu, 12 Aug 2021 15:12:59 +0000 (-0400)
Subject: ceph-volume: activate: try simple mode too
X-Git-Tag: v16.2.11~576^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=afc1db288d25a45cb16c8e977c1809fd0bb0b62c;p=ceph.git

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 <sage@newdream.net>
(cherry picked from commit 101c810a80eea14ab2a1edc8166dbbe76cd9e87a)
---

diff --git a/src/ceph-volume/ceph_volume/activate/main.py b/src/ceph-volume/ceph_volume/activate/main.py
index 40690c5d9760..1f8144ab2c50 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)')