git.rot13.org Git - gnt-info/blob - doc/rbd-showmapped-p.diff

   1 --- /usr/share/ganeti/2.15/ganeti/storage/bdev.py.orig  2018-09-08 19:22:03.000000000 +0200
   2 +++ /usr/share/ganeti/2.15/ganeti/storage/bdev.py       2019-04-25 09:16:12.708023721 +0200
   3 @@ -1020,8 +1020,6 @@
   4        showmap_cmd = [
   5          constants.RBD_CMD,
   6          "showmapped",
   7 -        "-p",
   8 -        pool,
   9          "--format",
  10          "json"
  11          ]
  12 @@ -1036,7 +1034,7 @@
  13      except RbdShowmappedJsonError:
  14        # For older versions of rbd, we have to parse the plain / text output
  15        # manually.
  16 -      showmap_cmd = [constants.RBD_CMD, "showmapped", "-p", pool]
  17 +      showmap_cmd = [constants.RBD_CMD, "showmapped"]
  18        result = utils.RunCmd(showmap_cmd)
  19        if result.failed:
  20          base.ThrowError("rbd showmapped failed (%s): %s",