From 901e5655035ab1274e43488bc932a68610c0af02 Mon Sep 17 00:00:00 2001
From: Anthony Young <sleepsonthefloor@gmail.com>
Date: Mon, 30 Apr 2012 13:21:48 -0700
Subject: [PATCH] Update to fix trunk nova issue with rpc library

 * rpc flags now must be manually initialized.
---
 utils/nova-novncproxy | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/utils/nova-novncproxy b/utils/nova-novncproxy
index 44d92925..cc1a5075 100755
--- a/utils/nova-novncproxy
+++ b/utils/nova-novncproxy
@@ -67,6 +67,13 @@ opts = [
 FLAGS = flags.FLAGS
 FLAGS.register_cli_opts(opts)
 
+# As of nova commit 0b11668e64450039dc071a4a123abd02206f865f we must
+# manually register the rpc library
+try:
+    rpc.register_opts(FLAGS)
+except:
+    pass
+
 
 class NovaWebSocketProxy(wsproxy.WebSocketProxy):
     def __init__(self, *args, **kwargs):