openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Pass empty stack_fields to update manager" into stable/ocata

This commit is contained in:
Jenkins 2017-02-27 23:53:06 +00:00 committed by Gerrit Code Review
parent 51eb51eab4 6c95332753
commit e0d48dd936
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tripleoclient/v1/overcloud_update.py
View File

@ -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):

9
tripleoclient/workflows/package_update.py
View File

@ -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):