summaryrefslogtreecommitdiff
path: root/keystonemiddleware/ec2_token.py
diff options
context:
space:
mode:
Diffstat (limited to 'keystonemiddleware/ec2_token.py')
-rw-r--r--keystonemiddleware/ec2_token.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/keystonemiddleware/ec2_token.py b/keystonemiddleware/ec2_token.py
index faa5968..3e00646 100644
--- a/keystonemiddleware/ec2_token.py
+++ b/keystonemiddleware/ec2_token.py
@@ -44,6 +44,8 @@ keystone_ec2_opts = [
'CAs.'),
cfg.BoolOpt('insecure', default=False,
help='Disable SSL certificate verification.'),
+ cfg.IntOpt('timeout', default=60,
+ help='Timeout to obtain token.'),
]
CONF = cfg.CONF
@@ -172,9 +174,10 @@ class EC2Token(object):
elif CONF.keystone_ec2_token.certfile:
cert = CONF.keystone_ec2_token.certfile
- response = requests.request('POST', CONF.keystone_ec2_token.url,
- data=creds_json, headers=headers,
- verify=verify, cert=cert)
+ response = requests.post(CONF.keystone_ec2_token.url,
+ data=creds_json, headers=headers,
+ verify=verify, cert=cert,
+ timeout=CONF.keystone_ec2_token.timeout)
# NOTE(vish): We could save a call to keystone by
# having keystone return token, tenant,