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

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

diff --git a/ceph_deploy/rgw.py b/ceph_deploy/rgw.py
index 92abb0026a1e29012c6db31e2e6306358f5b1595..1c37a79815a45e1ba21d92098c6694f4af12a29e 100644 (file)
--- a/ceph_deploy/rgw.py
+++ b/ceph_deploy/rgw.py
@@ -118,9 +118,6 @@ def rgw_create(args):
         ' '.join(':'.join(x or '' for x in t) for t in args.rgw),
         )
 
-    if not args.rgw:
-        raise exc.NeedHostError()
-
     key = get_bootstrap_rgw_key(cluster=args.cluster)
 
     bootstrapped = set()
@@ -195,7 +192,7 @@ def make(parser):
     rgw_create.add_argument(
         'rgw',
         metavar='HOST[:NAME]',
-        nargs='*',
+        nargs='+',
         type=colon_separated,
         help='host (and optionally the daemon name) to deploy on. \
                 NAME is automatically prefixed with \'rgw.\'',

diff --git a/ceph_deploy/tests/parser/test_rgw.py b/ceph_deploy/tests/parser/test_rgw.py
index 3cd0f6c06deec58af1c54e4fc33b7f8b95a25879..69adb57d8cf6a11da083e11f804792c0b4bdc7ee 100644 (file)
--- a/ceph_deploy/tests/parser/test_rgw.py
+++ b/ceph_deploy/tests/parser/test_rgw.py
@@ -16,7 +16,6 @@ class TestParserRGW(object):
         assert 'positional arguments:' in out
         assert 'optional arguments:' in out
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12150")
     def test_rgw_create_host_required(self, capsys):
         with pytest.raises(SystemExit):
             self.parser.parse_args('rgw create'.split())