openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Handle port unprovision for pre-provisioned nodes" into stable/wallaby

Browse Source
This commit is contained in:
Zuul 2022-03-15 22:11:11 +00:00 committed by Gerrit Code Review
commit b7b58c4cc8
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tripleoclient/v2/overcloud_node.py
View File

@ -408,14 +408,36 @@ class UnprovisionNode(command.Command):
)
with open(unprovision_confirm) as f:
to_unprovision = json.load(f)
if not to_unprovision:
# (TODO: slagle) unprovision_confirm was previously a list,
# but was switched to a dict so that network ports for
# pre_provisioned nodes can also be confirmed for
# unprovisioning. Check the data structure for backwards
# compatibility, When the tripleo-ansible patch is merged,
# this check can be removed.
if isinstance(to_unprovision, dict):
instances = to_unprovision.get('instances')
pre_provisioned = to_unprovision.get('pre_provisioned')
else:
instances = to_unprovision
pre_provisioned = None
print()
if not (instances or pre_provisioned):
print('Nothing to unprovision, exiting')
return
self._print_nodes(to_unprovision)
print("The following nodes will be unprovisioned:")
self._print_nodes(instances)
print()
if pre_provisioned:
print("The following pre-provisioned nodes will "
"have network ports unprovisioned:")
self._print_nodes(pre_provisioned)
print()
confirm = oooutils.prompt_user_for_confirmation(
message=_("Are you sure you want to unprovision these %s "
"nodes [y/N]? ") % parsed_args.stack,
"nodes and ports [y/N]? ") % parsed_args.stack,
logger=self.log)
if not confirm:
raise oscexc.CommandError("Action not confirmed, exiting.")