openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Add option to bootstrap cephadm without --image" into stable/wallaby

Browse Source
This commit is contained in:
Zuul 2022-03-02 10:14:26 +00:00 committed by Gerrit Code Review
commit 423daff2f3
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tripleoclient/v2/overcloud_ceph.py
View File

@ -205,6 +205,13 @@ class OvercloudCephDeploy(command.Command):
"ContainerImageRegistryCredentials."
),
default=None)
parser.add_argument('--cephadm-default-container', default=False,
action='store_true',
help=_("Use the default continer defined in "
"cephadm instead of "
"container_image_prepare_defaults.yaml. "
"If this is used, 'cephadm bootstrap' is "
"not passed the --image parameter."))
container_group = parser.add_argument_group("container-image-prepare "
"overrides",
"The following options "
@ -405,6 +412,9 @@ class OvercloudCephDeploy(command.Command):
if parsed_args.single_host_defaults:
extra_vars["tripleo_cephadm_single_host_defaults"] = True
if parsed_args.cephadm_default_container:
extra_vars["tripleo_cephadm_default_container"] = True
skip_tags = []
if parsed_args.skip_user_create:
skip_tags.append('cephadm_ssh_user')