From 4ee5ef25dcaa9d4235e97972acdbbcbf5067d88c Mon Sep 17 00:00:00 2001
From: root <root@tonbuntu>
Date: Fri, 17 Sep 2010 19:28:10 -0700
Subject: add in support for ajaxterm console access

---
 nova/utils.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index 536d722bb..ed703a9db 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -92,6 +92,10 @@ def abspath(s):
     return os.path.join(os.path.dirname(__file__), s)
 
 
+def novadir(s):
+    return os.path.abspath(nova.__file__).split('nova/__init__.pyc')[0]
+
+
 def default_flagfile(filename='nova.conf'):
     for arg in sys.argv:
         if arg.find('flagfile') != -1:
-- 
cgit 


From a3077cbb859a9237f9516ed0f073fe00839277c4 Mon Sep 17 00:00:00 2001
From: root <root@tonbuntu>
Date: Mon, 1 Nov 2010 16:25:56 -0700
Subject: basics to get proxied ajaxterm working with virsh

---
 nova/utils.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova/utils.py')

diff --git a/nova/utils.py b/nova/utils.py
index ca9a667cf..be61767c7 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -100,7 +100,8 @@ def abspath(s):
     return os.path.join(os.path.dirname(__file__), s)
 
 
-def novadir(s):
+def novadir():
+    import nova
     return os.path.abspath(nova.__file__).split('nova/__init__.pyc')[0]
 
 
-- 
cgit