openstack
/
deb-python-monascaclient
Code Issues Proposed changes

Merge "X-Auth-Key should not be required in the header"

This commit is contained in:
Jenkins 2015-10-23 15:34:32 +00:00 committed by Gerrit Code Review
parent d5e366b3a4 6d6069eae2
commit 984ccccb5a
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
monascaclient/common/http.py
View File

@ -234,15 +234,8 @@ class HTTPClient(object):
self.log_http_response(resp)
if 'X-Auth-Key' not in kwargs['headers'] and \
(resp.status_code == 401 or
(resp.status_code == 500 and "(HTTP 401)" in resp.content)):
raise exc.HTTPUnauthorized("Authentication failed. Please try"
" again with option "
"--include-password or export "
"MONASCA_INCLUDE_PASSWORD=1\n")
elif (resp.status_code == 401 or
(resp.status_code == 500 and "(HTTP 401)" in resp.content)):
if (resp.status_code == 401 or
(resp.status_code == 500 and "(HTTP 401)" in resp.content)):
# re-authenticate and attempt one more request
try:
self.re_authenticate()