diff --git a/tripleoclient/v1/overcloud_update.py b/tripleoclient/v1/overcloud_update.py index 8d4e158ef..706b02874 100644 --- a/tripleoclient/v1/overcloud_update.py +++ b/tripleoclient/v1/overcloud_update.py @@ -84,11 +84,12 @@ class UpdateOvercloud(command.Command): self.log, clients, stack, stack_name, self.app_args.verbose_level, timeout) if status not in ['COMPLETE']: - raise exceptions.DeploymentError("Stack update failed.") + raise exceptions.DeploymentError("Package update failed.") else: - status = package_update.update(clients, container=stack_name, - queue_name=str(uuid.uuid4())) - print("stack {0} status: {1}".format(parsed_args.stack, status)) + package_update.update(clients, container=stack_name, + queue_name=str(uuid.uuid4())) + print("Package update on stack {0} initiated.".format( + parsed_args.stack)) class AbortUpdateOvercloud(command.Command): diff --git a/tripleoclient/workflows/package_update.py b/tripleoclient/workflows/package_update.py index 5bd94e1a3..40d3f8c94 100644 --- a/tripleoclient/workflows/package_update.py +++ b/tripleoclient/workflows/package_update.py @@ -16,6 +16,7 @@ import uuid from tripleo_common import update as update_common +from tripleoclient import utils as oooutils from tripleoclient.workflows import base @@ -55,10 +56,16 @@ def update_and_wait(log, clients, stack, plan_name, verbose_level, update_manager = update_common.PackageUpdateManager( heatclient=clients.orchestration, novaclient=clients.compute, - stack_id=stack) + stack_id=plan_name, + stack_fields={}) update_manager.do_interactive_update() + stack = oooutils.get_stack(clients.orchestration, + plan_name) + + return stack.status + def abort_update(clients, **workflow_input):