diff --git a/ceph_deploy/cli.py b/ceph_deploy/cli.py index 4d84ae36..e3358aa3 100644 --- a/ceph_deploy/cli.py +++ b/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', diff --git a/ceph_deploy/tests/parser/test_main.py b/ceph_deploy/tests/parser/test_main.py index 0b1a0470..5a71ec16 100644 --- a/ceph_deploy/tests/parser/test_main.py +++ b/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