diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-08 15:44:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-08 15:44:21 +0000 |
| commit | 7ad7e9049c651367e8a864863cde5f75fa45b5c9 (patch) | |
| tree | 5d4b3debcba81f91b42d100037d18063997a96c9 | |
| parent | e5844565440701a810047343d994ff48fc9e0e39 (diff) | |
| parent | 95d2e9082ea4c5263304ec81909109730908f8db (diff) | |
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."
| -rwxr-xr-x | bin/nova-xvpvncproxy | 3 |
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() |