Merge "Add --single-host-defaults to 'openstack overcloud ceph deploy'" into stable/wallaby

This commit is contained in:
Zuul 2022-03-01 22:49:28 +00:00 committed by Gerrit Code Review
commit b071bd4ba9

View File

@ -164,6 +164,10 @@ class OvercloudCephDeploy(command.Command):
"Path to an existing ceph.conf with settings " "Path to an existing ceph.conf with settings "
"to be assimilated by the new cluster via " "to be assimilated by the new cluster via "
"'cephadm bootstrap --config' ")), "'cephadm bootstrap --config' ")),
parser.add_argument('--single-host-defaults', default=False,
action='store_true',
help=_("Adjust configuration defaults to suit "
"a single-host Ceph cluster."))
spec_group = parser.add_mutually_exclusive_group() spec_group = parser.add_mutually_exclusive_group()
spec_group.add_argument('--ceph-spec', spec_group.add_argument('--ceph-spec',
help=_( help=_(
@ -398,6 +402,9 @@ class OvercloudCephDeploy(command.Command):
extra_vars["tripleo_cephadm_ssh_user"] = \ extra_vars["tripleo_cephadm_ssh_user"] = \
parsed_args.cephadm_ssh_user parsed_args.cephadm_ssh_user
if parsed_args.single_host_defaults:
extra_vars["tripleo_cephadm_single_host_defaults"] = True
skip_tags = [] skip_tags = []
if parsed_args.skip_user_create: if parsed_args.skip_user_create:
skip_tags.append('cephadm_ssh_user') skip_tags.append('cephadm_ssh_user')