ceph-volume: lvm: use argparse, report help as early as possible

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/activate.py b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
index 9ed80dbda0b13249305e23474cc6d8698be15b7d..b6d04f52d0386c2ef81e9206045b12f6c2495868 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/activate.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/activate.py
@@ -99,4 +99,6 @@ class Activate(object):
             help='filestore objectstore (current default)',
         )
         args = parser.parse_args(self.argv[1:])
+        if len(self.argv) <= 1:
+            return parser.print_help()
         self.activate(args)

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/main.py b/src/ceph-volume/ceph_volume/devices/lvm/main.py
index 98984d3c4f761e2630230dfdbcf1dc48fdc696ee..e9cf9cff4294f973f21e627845027b6148a0a4a9 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/main.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/main.py
@@ -1,5 +1,6 @@
+import argparse
 from textwrap import dedent
-from tambo import Transport
+from ceph_volume import terminal
 import activate
 import prepare
 
@@ -26,14 +27,12 @@ class LVM(object):
         return self._help.format(sub_help=sub_help)
 
     def main(self):
-        options = [['--log', '--logging']]
-        parser = Transport(self.argv, mapper=self.mapper,
-                           options=options, check_help=False,
-                           check_version=False)
-        parser.parse_args()
-        parser.catch_help = self.print_help(parser.subhelp())
-        parser.mapper = self.mapper
+        terminal.dispatch(self.mapper, self.argv)
+        parser = argparse.ArgumentParser(
+            prog='ceph-volume lvm',
+            formatter_class=argparse.RawDescriptionHelpFormatter,
+            description=self.print_help(terminal.subhelp(self.mapper)),
+        )
+        parser.parse_args(self.argv)
         if len(self.argv) <= 1:
             return parser.print_help()
-        parser.dispatch()
-        parser.catches_help()

diff --git a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
index ef63e5ea1900a8979d7104a559e4d87acf082139..46b10b52306d345023abfd366daae7b904d862b5 100644 (file)
--- a/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
+++ b/src/ceph-volume/ceph_volume/devices/lvm/prepare.py
@@ -206,5 +206,7 @@ class Prepare(object):
             '--osd-fsid',
             help='Reuse an existing OSD fsid',
         )
-        args = parser.parse_args(self.argv[1:])
+        args = parser.parse_args(self.argv)
+        if len(self.argv) <= 1:
+            return parser.print_help()
         self.prepare(args)