summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Kearney <josh@jk0.org>2011-06-28 18:13:23 -0500
committerJosh Kearney <josh@jk0.org>2011-06-28 18:13:23 -0500
commit0a4e986cd69f932b61d2f13a24d8d4d4ec154527 (patch)
tree5d33b9b8c8aeb956fcddf612d1f65a1412115030
parentd59e576dfeccdbd7ee82ea2803b57e24dcba2c22 (diff)
parent014c646ad36c0e790006a9832660d9ecd0c5b370 (diff)
downloadnova-0a4e986cd69f932b61d2f13a24d8d4d4ec154527.tar.gz
nova-0a4e986cd69f932b61d2f13a24d8d4d4ec154527.tar.xz
nova-0a4e986cd69f932b61d2f13a24d8d4d4ec154527.zip
Merged trunk
-rwxr-xr-xbin/nova-api6
1 files changed, 6 insertions, 0 deletions
diff --git a/bin/nova-api b/bin/nova-api
index ea99a1b48..fff67251f 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -23,8 +23,14 @@ Starts both the EC2 and OpenStack APIs in separate processes.
"""
+import os
import sys
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(
+ sys.argv[0]), os.pardir, os.pardir))
+if os.path.exists(os.path.join(possible_topdir, "nova", "__init__.py")):
+ sys.path.insert(0, possible_topdir)
+
import nova.service
import nova.utils