diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-04-04 09:26:53 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-04-04 09:26:53 +0000 |
| commit | 0ec596adb5b703b6a61064dc50811bf8fa5512cf (patch) | |
| tree | 988f6d051240c70009a7b930a10c7d11a47dc230 | |
| parent | 78cebece92abc63490595178caa6aaf09fab1545 (diff) | |
| parent | 0ac84747b7f25e44c2c8f6a574ba660609d4a0e7 (diff) | |
| download | nova-0ec596adb5b703b6a61064dc50811bf8fa5512cf.tar.gz nova-0ec596adb5b703b6a61064dc50811bf8fa5512cf.tar.xz nova-0ec596adb5b703b6a61064dc50811bf8fa5512cf.zip | |
Make euca-get-ajax-console work with Euca2ools 1.3
| -rwxr-xr-x | tools/euca-get-ajax-console | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tools/euca-get-ajax-console b/tools/euca-get-ajax-console index 3df3dcb53..a67c79d90 100755 --- a/tools/euca-get-ajax-console +++ b/tools/euca-get-ajax-console @@ -35,6 +35,7 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')): import boto import nova from boto.ec2.connection import EC2Connection +import euca2ools from euca2ools import Euca2ool, InstanceValidationError, Util usage_string = """ @@ -93,8 +94,13 @@ def override_connect_ec2(aws_access_key_id=None, aws_secret_access_key, **kwargs) # override boto's connect_ec2 method, so that we can use NovaEC2Connection +# (This is for Euca2ools 1.2) boto.connect_ec2 = override_connect_ec2 +# Override Euca2ools' EC2Connection class (which it gets from boto) +# (This is for Euca2ools 1.3) +euca2ools.EC2Connection = NovaEC2Connection + def usage(status=1): print usage_string |