crabapples
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge ca78183171 into 483157f87f

This commit is contained in:
GitHub Merge Button 2012-04-30 14:09:17 -07:00
parent 483157f87f ca78183171
commit 680d6680dc
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
utils/nova-novncproxy
View File

@ -67,6 +67,11 @@ opts = [
FLAGS = flags.FLAGS FLAGS = flags.FLAGS
FLAGS.register_cli_opts(opts) FLAGS.register_cli_opts(opts)
# As of nova commit 0b11668e64450039dc071a4a123abd02206f865f we must
# manually register the rpc library
if hasattr(rpc, 'register_opts'):
rpc.register_opts(FLAGS)
class NovaWebSocketProxy(wsproxy.WebSocketProxy): class NovaWebSocketProxy(wsproxy.WebSocketProxy):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):