summaryrefslogtreecommitdiffstats
path: root/bin/nova-direct-api
diff options
context:
space:
mode:
authorRyan Lane <rlane@wikimedia.org>2011-03-03 23:04:11 +0000
committerRyan Lane <rlane@wikimedia.org>2011-03-03 23:04:11 +0000
commitdf3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4 (patch)
treeaab853348a2df9f5cdb26a77dd836d4f2083f119 /bin/nova-direct-api
parent4c50ddee48971c76f0f6252295747b89de5d3697 (diff)
parent7ca1669603132e3afd14606dda3f95ccbce08a41 (diff)
downloadnova-df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4.tar.gz
nova-df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4.tar.xz
nova-df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4.zip
Merge from trunk
Diffstat (limited to 'bin/nova-direct-api')
-rwxr-xr-xbin/nova-direct-api6
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/nova-direct-api b/bin/nova-direct-api
index 173b39bdb..bf29d9a5e 100755
--- a/bin/nova-direct-api
+++ b/bin/nova-direct-api
@@ -35,6 +35,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
gettext.install('nova', unicode=1)
from nova import flags
+from nova import log as logging
from nova import utils
from nova import wsgi
from nova.api import direct
@@ -44,10 +45,15 @@ from nova.compute import api as compute_api
FLAGS = flags.FLAGS
flags.DEFINE_integer('direct_port', 8001, 'Direct API port')
flags.DEFINE_string('direct_host', '0.0.0.0', 'Direct API host')
+flags.DEFINE_flag(flags.HelpFlag())
+flags.DEFINE_flag(flags.HelpshortFlag())
+flags.DEFINE_flag(flags.HelpXMLFlag())
+
if __name__ == '__main__':
utils.default_flagfile()
FLAGS(sys.argv)
+ logging.setup()
direct.register_service('compute', compute_api.API())
direct.register_service('reflect', direct.Reflection())