diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-15 18:03:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-15 18:03:24 +0000 |
| commit | 0bb26b959e856be12f75c403f444bcf706ee7660 (patch) | |
| tree | c80692d742522946fe85294696a616824404da4d | |
| parent | 3b028db6c9ff5b464fc3ac399dbc93a43425f4d5 (diff) | |
| parent | f3d497b241c4685c5429866b6d3176f0faadf904 (diff) | |
Merge "'text/json' should be 'application/json' (bug 843226)"
| -rwxr-xr-x | keystone/middleware/quantum_auth_token.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/keystone/middleware/quantum_auth_token.py b/keystone/middleware/quantum_auth_token.py index 7eaf272a..33a754da 100755 --- a/keystone/middleware/quantum_auth_token.py +++ b/keystone/middleware/quantum_auth_token.py @@ -214,7 +214,9 @@ class AuthProtocol(object): validate a user's token. Validate_token is a priviledged call so it needs to be authenticated by a service that is calling it """ - headers = {"Content-type": "application/json", "Accept": "text/json"} + headers = { + "Content-type": "application/json", + "Accept": "application/json"} params = { "auth": { @@ -264,7 +266,7 @@ class AuthProtocol(object): # since this is a priviledged op,m we need to auth ourselves # by using an admin token headers = {"Content-type": "application/json", - "Accept": "text/json", + "Accept": "application/json", "X-Auth-Token": self.admin_token} conn = http_connect(self.auth_host, self.auth_port, 'GET', self._build_token_uri(claims), headers=headers) @@ -296,7 +298,7 @@ class AuthProtocol(object): # Valid token. Get user data and put it in to the call # so the downstream service can use it headers = {"Content-type": "application/json", - "Accept": "text/json", + "Accept": "application/json", "X-Auth-Token": self.admin_token} conn = http_connect(self.auth_host, self.auth_port, 'GET', self._build_token_uri(self.claims), |