summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorAntony Messerli <amesserl@rackspace.com>2012-05-07 20:49:23 -0500
committerAntony Messerli <amesserl@rackspace.com>2012-05-07 20:53:39 -0500
commit95d2e9082ea4c5263304ec81909109730908f8db (patch)
treeae452dc48d4b2a4a9f7a48d296e2fdfbfeaab513 /bin
parentd659aaac90f266f5cf90f509323b4aa06146093d (diff)
A previous patch decoupled the RPC drivers from the nova.flags, breaking instance audit usage in the process.
This configures the xvpvncproxy to configure the RPC drivers properly with FLAGS so that xvpvncproxy can run. Change-Id: I71d27a06060120448bd3401ee91566dbc3b6a289
Diffstat (limited to 'bin')
-rwxr-xr-xbin/nova-xvpvncproxy3
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/nova-xvpvncproxy b/bin/nova-xvpvncproxy
index a17d0cbb3..cfd3edc3d 100755
--- a/bin/nova-xvpvncproxy
+++ b/bin/nova-xvpvncproxy
@@ -33,12 +33,15 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
from nova import flags
from nova import log as logging
+from nova import rpc
from nova import service
from nova import utils
from nova.vnc import xvp_proxy
+FLAGS = flags.FLAGS
if __name__ == "__main__":
+ rpc.register_opts(FLAGS)
utils.default_flagfile()
flags.FLAGS(sys.argv)
logging.setup()