Merge lp:~soren/nova/support-newer-euca2ools into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Make euca-get-ajax-console work with Euca2ools 1.3

[lp:~soren/nova/support-newer-euca2ools]

927. By Soren Hansen on 2011-04-01

Add euca2ools import

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[Todd Willey (xtoddx)]

review: Approve

[Todd Willey (xtoddx)]

I didn't set ststus to approved since it wasn't linked to a bug report, and I'm not sure enough of the process after FF to know that approving wouldn't be faux pas. I'd like this in though, so change status as appropriate.

[lp:~soren/nova/support-newer-euca2ools]

928. By Soren Hansen on 2011-04-04

Add bug reference.

[Soren Hansen (soren)]

> I didn't set ststus to approved since it wasn't linked to a bug report, and
> I'm not sure enough of the process after FF to know that approving wouldn't be
> faux pas. I'd like this in though, so change status as appropriate.

Good point. I forgot. Bug reference added, Approved button clicked. :)

=== modified file 'tools/euca-get-ajax-console'
--- tools/euca-get-ajax-console	2011-03-18 13:56:05 +0000
+++ tools/euca-get-ajax-console	2011-04-04 09:17:45 +0000
@@ -35,6 +35,7 @@
 import boto
 import nova
 from boto.ec2.connection import EC2Connection
+import euca2ools
 from euca2ools import Euca2ool, InstanceValidationError, Util
 
 usage_string = """
@@ -93,8 +94,13 @@
                              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