From: Guillaume Abrioux Date: Wed, 10 Aug 2022 15:01:19 +0000 (+0200) Subject: cephadm: fix incorrect warning X-Git-Tag: v17.2.6~98^2~54^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=08fe3903657628839ccc5fcaa70abe158a6c3995;p=ceph.git cephadm: fix incorrect warning when running `ceph orch osd rm` with `--zap`, it throws a warning whereas it shouldn't Signed-off-by: Guillaume Abrioux (cherry picked from commit bed306c42f2670fc681302dcfe6a1c5ed818dd09) --- diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index e06ff1359e5d8..ddaf68a9c4214 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -2848,9 +2848,9 @@ Then run the following: # trigger the serve loop to initiate the removal self._kick_serve_loop() - warning_zap = "" if not zap else ("\nVG/LV for the OSDs won't be zapped (--zap wasn't passed).\n" - "Run the `ceph-volume lvm zap` command with `--destroy`" - " against the VG/LV if you want them to be destroyed.") + warning_zap = "" if zap else ("\nVG/LV for the OSDs won't be zapped (--zap wasn't passed).\n" + "Run the `ceph-volume lvm zap` command with `--destroy`" + " against the VG/LV if you want them to be destroyed.") return f"Scheduled OSD(s) for removal.{warning_zap}" @handle_orch_error