Merge lp:~jml/launchpad/update-ec2-image into lp:launchpad

[Jonathan Lange]

Add jml as ec2 image updater, pass --name to ec2-register

This branch adds me as an image updater and provides the 'name' option to 'ec2-register', which seems to need it these days.

[Michael Hudson-Doyle (mwhudson)]

Hi,

1. If it's necessary to put account numbers that have a leading 0 as strings in VALID_AMI_OWNERS, then all of them should be like that.

2. --name isn't permitted by ec2-register on karmic, so I think we need to do something different there :/

3. It sounds like the script still doesn't work for you, so it would be good to wait until you have something working before landing this I guess?

Cheers,
mwh

review: Needs Fixing

[Jonathan Lange (jml)]

Agree re 1 & 3.

Do we need to support karmic?

[Michael Hudson-Doyle (mwhudson)]

No, I guess not supporting karmic is ok now the beta is out.

[Jonathan Lange (jml)]

The script works now that bug 542395 has been fixed in openjdk. Is this ready to land?

[Michael Hudson-Doyle (mwhudson)]

I wish I knew a bit more what --name actually did, but yes, looks good to me.

Man, jdk bugs. I guess that's what beta testing the distro is for :-)

review: Approve

=== modified file 'lib/devscripts/ec2test/account.py'
--- lib/devscripts/ec2test/account.py	2010-02-09 14:20:54 +0000
+++ lib/devscripts/ec2test/account.py	2010-03-22 15:24:38 +0000
@@ -21,11 +21,12 @@
 import paramiko
 
 VALID_AMI_OWNERS = (
-    255383312499, # gary
-    559320013529, # flacoste
-    200337130613, # mwhudson
-    889698597288, # henninge
-    366009196755, # salgado
+    '255383312499', # gary
+    '559320013529', # flacoste
+    '200337130613', # mwhudson
+    '889698597288', # henninge
+    '366009196755', # salgado
+    '036590675370', # jml
     # ...anyone else want in on the fun?
     )
 

=== modified file 'lib/devscripts/ec2test/instance.py'
--- lib/devscripts/ec2test/instance.py	2010-02-16 20:07:09 +0000
+++ lib/devscripts/ec2test/instance.py	2010-03-22 15:24:38 +0000
@@ -560,6 +560,7 @@
             'ec2-register',
             '--private-key=%s' % self.local_pk,
             '--cert=%s' % self.local_cert,
+            '--name=%s' % (name,),
             manifest_path,
             ]
         self.log("Executing command: %s" % ' '.join(cmd))