Merge pull request #3648 from echohead/glance-image-timeout

Fix 'timeout' parameter of glance-image module.
reviewable/pr18780/r1
Michael DeHaan 11 years ago
commit 38055e33c5

@ -176,7 +176,7 @@ def _glance_image_create(module, params, client):
'copy_from': params.get('copy_from'), 'copy_from': params.get('copy_from'),
} }
try: try:
timeout = params.get('timeout') timeout = float(params.get('timeout'))
expire = time.time() + timeout expire = time.time() + timeout
image = client.images.create(**kwargs) image = client.images.create(**kwargs)
if not params['copy_from']: if not params['copy_from']:

Loading…
Cancel
Save