]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume: fix generic activate 46511/head
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 1 Mar 2022 23:38:17 +0000 (00:38 +0100)
committerAdam King <adking@redhat.com>
Thu, 2 Jun 2022 21:59:35 +0000 (17:59 -0400)
afd8be7eac5e996c3bd07656601a4534053e2516 broke it.
It has dropped`block_wal` and `block_db` from
`ceph_volume.devices.raw.activate.activate_bluestore` but
`activate.main.Activate.main` still passes those arguments when
calling `RAWActivate([]).activate()`

Fixes: https://tracker.ceph.com/issues/54441
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 3337b62e859673cba908bf8e12c7f3f23fddf2c2)

src/ceph-volume/ceph_volume/activate/main.py

index e1ab4fa2a298ef17feb951e62de333f034a96c47..bcd4685155d3bef65c82af76640c891747728198 100644 (file)
@@ -50,8 +50,6 @@ class Activate(object):
                 start_osd_uuid=self.args.osd_uuid,
                 tmpfs=not self.args.no_tmpfs,
                 systemd=not self.args.no_systemd,
-                block_wal=None,
-                block_db=None,
             )
             return
         except Exception as e: