diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-17 21:25:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-17 21:25:47 +0000 |
| commit | 5c94eea7edae746c017372bc726977c2206bccd6 (patch) | |
| tree | 234de5eb05b07f0c9cfd750e6f0f77e9e791ed8b /bin | |
| parent | 3a0102668c18c511505ee666badafd738f0d9bd6 (diff) | |
| parent | faf4e9a976600c6608fcf17485bd667766335fce (diff) | |
| download | nova-5c94eea7edae746c017372bc726977c2206bccd6.tar.gz nova-5c94eea7edae746c017372bc726977c2206bccd6.tar.xz nova-5c94eea7edae746c017372bc726977c2206bccd6.zip | |
Merge "Use consoleauth rpcapi in nova-novncproxy."
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-novncproxy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy index 3abaaa769..483c72e81 100755 --- a/bin/nova-novncproxy +++ b/bin/nova-novncproxy @@ -28,6 +28,7 @@ import sys import websockify +from nova.consoleauth import rpcapi as consoleauth_rpcapi from nova import context from nova import flags from nova.openstack.common import cfg @@ -84,9 +85,8 @@ class NovaWebSocketProxy(websockify.WebSocketProxy): cookie.load(self.headers.getheader('cookie')) token = cookie['token'].value ctxt = context.get_admin_context() - connect_info = rpc.call(ctxt, 'consoleauth', - {'method': 'check_token', - 'args': {'token': token}}) + rpcapi = consoleauth_rpcapi.ConsoleAuthAPI() + connect_info = rpcapi.check_token(ctxt, token=token) if not connect_info: LOG.audit("Invalid Token: %s", token) |