[RM-12150] Require at least one host for 'mds create'

Signed-off-by: Travis Rhoden <trhoden@redhat.com>

diff --git a/ceph_deploy/mds.py b/ceph_deploy/mds.py
index 4304419aa1a97f1d1d9e86e828edce156ec99664..d053aca9223f3efe518021d5d314f29b4d88c3f9 100644 (file)
--- a/ceph_deploy/mds.py
+++ b/ceph_deploy/mds.py
@@ -131,9 +131,6 @@ def mds_create(args):
         ' '.join(':'.join(x or '' for x in t) for t in args.mds),
         )
 
-    if not args.mds:
-        raise exc.NeedHostError()
-
     key = get_bootstrap_mds_key(cluster=args.cluster)
 
     bootstrapped = set()
@@ -220,7 +217,7 @@ def make(parser):
     mds_create.add_argument(
         'mds',
         metavar='HOST[:NAME]',
-        nargs='*',
+        nargs='+',
         type=colon_separated,
         help='host (and optionally the daemon name) to deploy on',
         )

diff --git a/ceph_deploy/tests/parser/test_mds.py b/ceph_deploy/tests/parser/test_mds.py
index 5f68d842b5f101d03639a4ee2e25f740825c77c7..ec9a02bc346a60696b55c0d88f687408cec02cac 100644 (file)
--- a/ceph_deploy/tests/parser/test_mds.py
+++ b/ceph_deploy/tests/parser/test_mds.py
@@ -16,7 +16,6 @@ class TestParserMDS(object):
         assert 'positional arguments:' in out
         assert 'optional arguments:' in out
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12150")
     def test_mds_create_host_required(self, capsys):
         with pytest.raises(SystemExit):
             self.parser.parse_args('mds create'.split())