diff options
| author | Ryan Lane <rlane@wikimedia.org> | 2011-03-03 23:04:11 +0000 |
|---|---|---|
| committer | Ryan Lane <rlane@wikimedia.org> | 2011-03-03 23:04:11 +0000 |
| commit | df3a65793ec7bb9d85d2a3da47fbbfb9e97d03d4 (patch) | |
| tree | aab853348a2df9f5cdb26a77dd836d4f2083f119 /tools | |
| parent | 4c50ddee48971c76f0f6252295747b89de5d3697 (diff) | |
| parent | 7ca1669603132e3afd14606dda3f95ccbce08a41 (diff) | |
Merge from trunk
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/euca-get-ajax-console | 4 | ||||
| -rw-r--r-- | tools/pip-requires | 1 |
2 files changed, 3 insertions, 2 deletions
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: diff --git a/tools/pip-requires b/tools/pip-requires index 3587df644..3c9047e04 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-novaclient==2.3 python-daemon==1.5.5 python-gflags==1.3 redis==2.0.0 |