Merge "Specify timeout for _get_token REST API request in cert-mon"
This commit is contained in:
commit
40cc51eeaa
|
@ -422,7 +422,7 @@ def get_dc_token(region_name):
|
||||||
|
|
||||||
|
|
||||||
def _get_token(auth_url, auth_project, username, password, user_domain,
|
def _get_token(auth_url, auth_project, username, password, user_domain,
|
||||||
project_domain, region_name):
|
project_domain, region_name, timeout=60):
|
||||||
"""
|
"""
|
||||||
Ask OpenStack Keystone for a token
|
Ask OpenStack Keystone for a token
|
||||||
Returns: token object or None on failure
|
Returns: token object or None on failure
|
||||||
|
@ -453,7 +453,7 @@ def _get_token(auth_url, auth_project, username, password, user_domain,
|
||||||
|
|
||||||
request_info.add_data(payload)
|
request_info.add_data(payload)
|
||||||
|
|
||||||
request = urlopen(request_info)
|
request = urlopen(request_info, timeout=timeout)
|
||||||
# Identity API v3 returns token id in X-Subject-Token
|
# Identity API v3 returns token id in X-Subject-Token
|
||||||
# response header.
|
# response header.
|
||||||
token_id = request.info().getheader('X-Subject-Token')
|
token_id = request.info().getheader('X-Subject-Token')
|
||||||
|
|
Loading…
Reference in New Issue