diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-30 16:56:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-30 16:56:15 +0000 |
| commit | 5c8f8b64918b1cf1e4249f52527b82fd317e87c4 (patch) | |
| tree | 4c29801fa4828d7c75909c4394a8c44217507805 /keystoneclient/middleware | |
| parent | 5d6137f26c3e9ba65e47476232ec0af632086e16 (diff) | |
| parent | 645e5bacf2c4c8bd9ee37f84af9a9c6aa3cf284a (diff) | |
| download | python-keystoneclient-5c8f8b64918b1cf1e4249f52527b82fd317e87c4.tar.gz | |
Merge "use v3 api to get certificates"
Diffstat (limited to 'keystoneclient/middleware')
| -rw-r--r-- | keystoneclient/middleware/auth_token.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/keystoneclient/middleware/auth_token.py b/keystoneclient/middleware/auth_token.py index d252bf1..fdb646d 100644 --- a/keystoneclient/middleware/auth_token.py +++ b/keystoneclient/middleware/auth_token.py @@ -1297,7 +1297,15 @@ class AuthProtocol(object): return self.cms_verify(data['signed']) def _fetch_cert_file(self, cert_file_name, cert_type): - path = '/v2.0/certificates/' + cert_type + if not self.auth_version: + self.auth_version = self._choose_api_version() + + if self.auth_version == 'v3.0': + if cert_type == 'signing': + cert_type = 'certificates' + path = '/v3/OS-SIMPLE-CERT/' + cert_type + else: + path = '/v2.0/certificates/' + cert_type response = self._http_request('GET', path) if response.status_code != 200: raise exceptions.CertificateConfigError(response.text) |