RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 11:07:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #37221 into master

Browse Source 
* refs/pull/37221/head:
	ceph-volume: add no-systemd argument to zap

Reviewed-by: Jan Fajerski <jfajerski@suse.com>
This commit is contained in:
Jan Fajerski 2020-10-05 09:29:07 +02:00
commit edb851be09
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ceph-volume/ceph_volume/devices/lvm/zap.py
View File

@ -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