Merge pull request #441 from ceph/RM-20228

remove custom cluster names for deploying

ceph_deploy/cli.py

@@ -68,12 +68,6 @@ def get_parser():
         action='store_true',
         help='overwrite an existing conf file on remote host (if present)',
         )
-    parser.add_argument(
-        '--cluster',
-        metavar='NAME',
-        help='name of the cluster',
-        type=validate.alphanumeric,
-        )
     parser.add_argument(
         '--ceph-conf',
         dest='ceph_conf',

ceph_deploy/tests/parser/test_main.py

@@ -65,17 +65,6 @@ def test_default_cluster_name(self):
         args = self.parser.parse_args('forgetkeys'.split())
         assert args.cluster == 'ceph'
 
-    def test_custom_cluster_name(self):
-        args = self.parser.parse_args('--cluster myhugecluster forgetkeys'.split())
-        assert args.cluster == 'myhugecluster'
-
-    def test_custom_cluster_name_bad(self, capsys):
-        with pytest.raises(SystemExit):
-            self.parser.parse_args('--cluster=/evil-this-should-not-be-created'.split())
-        out, err = capsys.readouterr()
-        assert ('--cluster: argument must start with a letter and contain only '
-                'letters and numbers') in err
-
     def test_default_ceph_conf_is_none(self):
         args = self.parser.parse_args('forgetkeys'.split())
         assert args.ceph_conf is None