cli: make -q work, and make -v and -q mutually exclusive

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/ceph_deploy/cli.py b/ceph_deploy/cli.py
index 7541a2763be3450b9b082baaecaa8927dff5273c..734ce1481ae777bb45469bd9c971a68956b660b5 100644 (file)
--- a/ceph_deploy/cli.py
+++ b/ceph_deploy/cli.py
@@ -16,14 +16,15 @@ def parse_args(args=None, namespace=None):
     parser = argparse.ArgumentParser(
         description='Deploy Ceph',
         )
-    parser.add_argument(
+    verbosity = parser.add_mutually_exclusive_group(required=False)
+    verbosity.add_argument(
         '-v', '--verbose',
         action='store_true', dest='verbose', default=False,
         help='be more verbose',
         )
-    parser.add_argument(
+    verbosity.add_argument(
         '-q', '--quiet',
-        action='store_false', dest='verbose',
+        action='store_true', dest='quiet',
         help='be less verbose',
         )
     parser.add_argument(
@@ -82,6 +83,8 @@ def main(args=None, namespace=None):
     args = parse_args(args=args, namespace=namespace)
 
     console_loglevel = logging.INFO
+    if args.quiet:
+        console_loglevel = logging.WARNING
     if args.verbose:
         console_loglevel = logging.DEBUG
     sh = logging.StreamHandler()