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

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

diff --git a/ceph_deploy/config.py b/ceph_deploy/config.py
index a2ce40ff634c30c7b3a6eebb6f1e258d5ec2d91b..593d0bfe49a698ee1e70c60763b93b92946dd9ff 100644 (file)
--- a/ceph_deploy/config.py
+++ b/ceph_deploy/config.py
@@ -91,7 +91,7 @@ def make(parser):
     config_push.add_argument(
         'client',
         metavar='HOST',
-        nargs='*',
+        nargs='+',
         help='host(s) to push the config file to',
         )
 
@@ -102,7 +102,7 @@ def make(parser):
     config_pull.add_argument(
         'client',
         metavar='HOST',
-        nargs='*',
+        nargs='+',
         help='host(s) to pull the config file from',
         )
     parser.set_defaults(

diff --git a/ceph_deploy/tests/parser/test_config.py b/ceph_deploy/tests/parser/test_config.py
index d71461e7cfae43e7ea103a8bb19d4fe04483cce9..41fe9491af0946f4c3185f4c85f008bf92a4d366 100644 (file)
--- a/ceph_deploy/tests/parser/test_config.py
+++ b/ceph_deploy/tests/parser/test_config.py
@@ -28,7 +28,6 @@ class TestParserConfig(object):
         out, err = capsys.readouterr()
         assert 'invalid choice' in err
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12150")
     def test_config_push_host_required(self, capsys):
         with pytest.raises(SystemExit):
             self.parser.parse_args('config push'.split())
@@ -44,7 +43,6 @@ class TestParserConfig(object):
         args = self.parser.parse_args('config push'.split() + hostnames)
         assert args.client == hostnames
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12150")
     def test_config_pull_host_required(self, capsys):
         with pytest.raises(SystemExit):
             self.parser.parse_args('config pull'.split())