]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fix incorrect warning 47608/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Wed, 10 Aug 2022 15:01:19 +0000 (17:01 +0200)
committerAdam King <adking@redhat.com>
Mon, 15 Aug 2022 17:15:19 +0000 (13:15 -0400)
when running `ceph orch osd rm` with `--zap`, it throws a warning
whereas it shouldn't

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit bed306c42f2670fc681302dcfe6a1c5ed818dd09)

src/pybind/mgr/cephadm/module.py

index e06ff1359e5d832b7c57ecb25d9c378f6689d35a..ddaf68a9c4214fdfa8459b29a5563f6ebf265236 100644 (file)
@@ -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