summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 07:12:43 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 07:12:43 +0000
commit7d39ad5c601d26c42e68818740e9c43b6b2144d4 (patch)
tree0b989878ee6405cc5ff8bc0cac7977ebc6d89e6d
parentd6499b65add7deb64a504a35928c9e9a86ce91c9 (diff)
parent7dcc0715bdc019cc00fd50afba42d3e81850dac6 (diff)
Merge "Use timeout as whole seconds in swift plugin" into stable/newtonstable/newton
-rw-r--r--heat/engine/clients/os/swift.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/heat/engine/clients/os/swift.py b/heat/engine/clients/os/swift.py
index bed42b3..ce02dbf 100644
--- a/heat/engine/clients/os/swift.py
+++ b/heat/engine/clients/os/swift.py
@@ -113,7 +113,7 @@ class SwiftClientPlugin(client_plugin.ClientPlugin):
113 path = '/v1/AUTH_%s/%s/%s' % (self.context.tenant_id, container_name, 113 path = '/v1/AUTH_%s/%s/%s' % (self.context.tenant_id, container_name,
114 obj_name) 114 obj_name)
115 if timeout is None: 115 if timeout is None:
116 timeout = MAX_EPOCH - 60 - time.time() 116 timeout = int(MAX_EPOCH - 60 - time.time())
117 tempurl = swiftclient_utils.generate_temp_url(path, timeout, key, 117 tempurl = swiftclient_utils.generate_temp_url(path, timeout, key,
118 method) 118 method)
119 sw_url = parse.urlparse(self.client().url) 119 sw_url = parse.urlparse(self.client().url)