openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Allow user to override Ceph cluster name" into stable/wallaby

This commit is contained in:
Zuul 2022-04-18 21:41:44 +00:00 committed by Gerrit Code Review
parent e4f953ccdb 34243123b9
commit d58f25a43f
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tripleoclient/tests/v2/overcloud_ceph/test_overcloud_ceph.py
View File

@ -66,6 +66,7 @@ class TestOvercloudCephDeploy(fakes.FakePlaybookExecution):
"working_dir": mock.ANY,
"stack_name": 'overcloud',
'tripleo_cephadm_ssh_user': 'jimmy',
'tripleo_cephadm_cluster': 'ceph',
'tripleo_roles_path': mock.ANY,
'tripleo_cephadm_container_ns': 'quay.io/ceph',
'tripleo_cephadm_container_image': 'ceph',

17
tripleoclient/v2/overcloud_ceph.py
View File

@ -159,6 +159,19 @@ class OvercloudCephDeploy(command.Command):
"used for the Ceph cluster_network. "
"Defaults to 'storage_mgmt'."),
default='storage_mgmt')
parser.add_argument('--cluster',
help=_(
"Name of the Ceph cluster. "
"If set to 'foo', then the files "
"/etc/ceph/<FSID>/foo.conf and "
"/etc/ceph/<FSID>/foo.client.admin.keyring "
"will be created. Otherwise these "
"files will use the name 'ceph'. "
"Changing this means changing command line "
"calls too, e.g. 'ceph health' will become "
"'ceph --cluster foo health' unless export "
"CEPH_ARGS='--cluster foo' is used."),
default='ceph')
parser.add_argument('--config',
help=_(
"Path to an existing ceph.conf with settings "
@ -336,6 +349,10 @@ class OvercloudCephDeploy(command.Command):
parsed_args.cluster_network_name)
extra_vars = {**extra_vars, **ceph_networks_map}
if parsed_args.cluster:
extra_vars['tripleo_cephadm_cluster'] = \
parsed_args.cluster
if parsed_args.ceph_spec:
if not os.path.exists(parsed_args.ceph_spec):
raise oscexc.CommandError(