summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2010-12-22 02:19:38 -0800
committerAnthony Young <sleepsonthefloor@gmail.com>2010-12-22 02:19:38 -0800
commitf98bb2b2dee4a0ff67a6548646a852686092c53f (patch)
treea847e7439994839dd04931ab68e20ababac1ed4b /tools
parentd118660d1ba860842f539f5e42a1182dc70c3dbe (diff)
downloadnova-f98bb2b2dee4a0ff67a6548646a852686092c53f.tar.gz
connecting ajax proxy to rabbit to allow token based security
Diffstat (limited to 'tools')
-rwxr-xr-xtools/euca_additions/euca-get-ajax-console9
1 files changed, 9 insertions, 0 deletions
diff --git a/tools/euca_additions/euca-get-ajax-console b/tools/euca_additions/euca-get-ajax-console
index 869d5ff91a..49e7c378fa 100755
--- a/tools/euca_additions/euca-get-ajax-console
+++ b/tools/euca_additions/euca-get-ajax-console
@@ -3,6 +3,15 @@
import getopt
import os
import sys
+
+# If ../nova/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+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
from euca2ools import Euca2ool, InstanceValidationError, Util, ConnectionFailed
from nova.boto_extensions import *