summaryrefslogtreecommitdiffstats
path: root/bin/nova-compute
diff options
context:
space:
mode:
authorRyan Lane <laner@controller>2010-11-30 22:34:01 +0000
committerRyan Lane <laner@controller>2010-11-30 22:34:01 +0000
commit2cf46f1fb4384c476a6d3b31e71c266a67a4afd2 (patch)
tree1ab223d2116e12c68816f44c9b693dbdf4390664 /bin/nova-compute
parent7d462fd04cf799689bcbea0b926f0bd38e64869c (diff)
parent5269e689046276093b59c5a55ab9ecd3b3ed01b1 (diff)
Merge from trunk
Diffstat (limited to 'bin/nova-compute')
-rwxr-xr-xbin/nova-compute2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/nova-compute b/bin/nova-compute
index 1724e9659..a66477af5 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -34,10 +34,12 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
from nova import service
from nova import twistd
+from nova import utils
if __name__ == '__main__':
twistd.serve(__file__)
if __name__ == '__builtin__':
+ utils.default_flagfile()
application = service.Service.create() # pylint: disable=C0103