openstack
/
charm-ceph-radosgw
Code Issues Proposed changes

Merge "keystone: PKI token format removal"

This commit is contained in:
Jenkins 2017-08-23 15:41:42 +00:00 committed by Gerrit Code Review
parent 4d0c8eec05 ef3529161a
commit 9857a0e711
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hooks/utils.py
View File

@ -73,12 +73,14 @@ try:
from keystoneclient.exceptions import (
ConnectionRefused,
Forbidden,
InternalServerError,
)
except ImportError:
# Juno and older
from keystoneclient.exceptions import (
ConnectionError as ConnectionRefused,
Forbidden,
InternalServerError,
)
except ImportError:
keystoneclient = None
@ -352,7 +354,8 @@ def get_ks_cert(ksclient, auth_endpoint, cert_type):
# Juno and older
cert = requests.request('GET', "{}/certificates/{}".
format(auth_endpoint, cert_type)).text
except (ConnectionRefused, requests.exceptions.ConnectionError, Forbidden):
except (ConnectionRefused, requests.exceptions.ConnectionError,
Forbidden, InternalServerError):
raise KSCertSetupException("Error connecting to keystone")
return cert