From e5443fa3e436a95de9d1c353e8772436c7cba8b6 Mon Sep 17 00:00:00 2001
From: Sandy Walsh <sandy.walsh@rackspace.com>
Date: Thu, 17 Feb 2011 17:58:38 -0400
Subject: pip requires novatools

---
 tools/pip-requires | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tools')

diff --git a/tools/pip-requires b/tools/pip-requires
index 3587df644..a5d4675be 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -10,6 +10,7 @@ boto==1.9b
 carrot==0.10.5
 eventlet==0.9.12
 lockfile==0.8
+python-novatools==2.0
 python-daemon==1.5.5
 python-gflags==1.3
 redis==2.0.0
-- 
cgit 


From 4229990fa77d6edb73b88e92750a8779c478e40c Mon Sep 17 00:00:00 2001
From: Christian Berendt <berendt@b1-systems.de>
Date: Sat, 26 Feb 2011 19:09:57 +0100
Subject: replaced ConnectionFailed with Exception in
 tools/euca-get-ajax-console was not working for me with euca2tools 1.2
 (version 2007-10-10, release 31337)

---
 tools/euca-get-ajax-console | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tools')

diff --git a/tools/euca-get-ajax-console b/tools/euca-get-ajax-console
index 37060e74f..e407dd566 100755
--- a/tools/euca-get-ajax-console
+++ b/tools/euca-get-ajax-console
@@ -35,7 +35,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
 import boto
 import nova
 from boto.ec2.connection import EC2Connection
-from euca2ools import Euca2ool, InstanceValidationError, Util, ConnectionFailed
+from euca2ools import Euca2ool, InstanceValidationError, Util
 
 usage_string = """
 Retrieves a url to an ajax console terminal
@@ -147,7 +147,7 @@ def main():
 
         try:
             euca_conn = euca.make_connection()
-        except ConnectionFailed, e:
+        except Exception, e:
             print e.message
             sys.exit(1)
         try:
-- 
cgit