openstack
/
tripleo-common
Code Issues Proposed changes

Merge "[stable-only] Pass timeout in mins to create_temp_url()" into stable/train

This commit is contained in:
Zuul 2020-04-17 07:29:22 +00:00 committed by Gerrit Code Review
parent 49d1c8b1c8 e319325ed4
commit d5bb4f173f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleo_common/actions/deployment.py
View File

@ -38,7 +38,7 @@ class OrchestrationDeployAction(base.TripleOAction):
def __init__(self, server_id, config, name, input_values=[],
action='CREATE', signal_transport='TEMP_URL_SIGNAL',
timeout=300, group='script'):
timeout=600, group='script'):
super(OrchestrationDeployAction, self).__init__()
self.server_id = server_id
self.config = config
@ -89,7 +89,7 @@ class OrchestrationDeployAction(base.TripleOAction):
swift_url = deployment_utils.create_temp_url(swift_client,
self.name,
self.timeout)
self.timeout / 60)
container_name, object_name = \
self._extract_container_object_from_swift_url(swift_url)