Merge "Following up patch of c6102131994d8b1ab7189ddb3b3210c83edc4cd7"

This commit is contained in:
Jenkins 2017-04-12 11:41:07 +00:00 committed by Gerrit Code Review
commit d0c0bdada1
1 changed files with 3 additions and 2 deletions

View File

@ -42,7 +42,7 @@ class OnFailureRescheduleTask(flow_utils.MoganTask):
def __init__(self, engine_rpcapi):
requires = ['filter_properties', 'request_spec', 'instance',
'requested_networks', 'context']
'requested_networks', 'user_data', 'context']
super(OnFailureRescheduleTask, self).__init__(addons=[ACTION],
requires=requires)
self.engine_rpcapi = engine_rpcapi
@ -60,7 +60,7 @@ class OnFailureRescheduleTask(flow_utils.MoganTask):
pass
def _reschedule(self, context, cause, request_spec, filter_properties,
instance, requested_networks):
instance, requested_networks, user_data):
"""Actions that happen during the rescheduling attempt occur here."""
create_instance = self.engine_rpcapi.create_instance
@ -84,6 +84,7 @@ class OnFailureRescheduleTask(flow_utils.MoganTask):
retry_info['exc'] = traceback.format_exception(*cause.exc_info)
return create_instance(context, instance, requested_networks,
user_data=user_data,
request_spec=request_spec,
filter_properties=filter_properties)