Import ceph 15.2.8

[ceph.git] / ceph / src / ceph-volume / ceph_volume / devices / lvm / zap.py

diff --git a/ceph/src/ceph-volume/ceph_volume/devices/lvm/zap.py b/ceph/src/ceph-volume/ceph_volume/devices/lvm/zap.py
index 63624e55f5bd228b912bc5eaf09fa39944ea115f..21b54b6c0c419978bc5a9cfd6f8b3fbb41bb6087 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/devices/lvm/zap.py
+++ b/ceph/src/ceph-volume/ceph_volume/devices/lvm/zap.py
@@ -290,7 +290,7 @@ class Zap(object):
 
     @decorators.needs_root
     def zap_osd(self):
-        if self.args.osd_id:
+        if self.args.osd_id and not self.args.no_systemd:
             osd_is_running = systemctl.osd_is_active(self.args.osd_id)
             if osd_is_running:
                 mlogger.error("OSD ID %s is running, stop it with:" % self.args.osd_id)
@@ -384,6 +384,13 @@ class Zap(object):
             help='Specify an OSD FSID to detect associated devices for zapping',
         )
 
+        parser.add_argument(
+            '--no-systemd',
+            dest='no_systemd',
+            action='store_true',
+            help='Skip systemd unit checks',
+        )
+
         if len(self.argv) == 0:
             print(sub_command_help)
             return