Merge "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."

This commit is contained in:
Jenkins 2012-05-08 15:44:21 +00:00 committed by Gerrit Code Review
commit 7ad7e9049c
1 changed files with 3 additions and 0 deletions

View File

@ -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()