From: Travis Rhoden <trhoden@redhat.com>
Date: Wed, 1 Jul 2015 18:49:11 +0000 (-0700)
Subject: [RM-12150] Require at least one host for 'config'
X-Git-Tag: v1.5.26~12^2~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bbfd4c5158f21191935c83a18573fbafce39fa21;p=ceph-deploy.git

[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 a2ce40f..593d0bf 100644
--- 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 d71461e..41fe949 100644
--- 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())