Launchpad itself

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

  1. update-ec2-image
  2. Merge into devel
Proposed by Jonathan Lange
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~jml/launchpad/update-ec2-image
Merge into: lp:launchpad
Diff against target: 33 lines (+7/-5)
2 files modified
lib/devscripts/ec2test/account.py (+6/-5)
lib/devscripts/ec2test/instance.py (+1/-0)
To merge this branch: bzr merge lp:~jml/launchpad/update-ec2-image
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Review via email: mp+21804@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

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
Revision history for this message
Jonathan Lange (jml) wrote :

Agree re 1 & 3.

Do we need to support karmic?

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

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

Revision history for this message
Jonathan Lange (jml) wrote :

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

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/devscripts/ec2test/account.py'
2--- lib/devscripts/ec2test/account.py 2010-02-09 14:20:54 +0000
3+++ lib/devscripts/ec2test/account.py 2010-03-22 15:24:38 +0000
4@@ -21,11 +21,12 @@
5 import paramiko
6
7 VALID_AMI_OWNERS = (
8- 255383312499, # gary
9- 559320013529, # flacoste
10- 200337130613, # mwhudson
11- 889698597288, # henninge
12- 366009196755, # salgado
13+ '255383312499', # gary
14+ '559320013529', # flacoste
15+ '200337130613', # mwhudson
16+ '889698597288', # henninge
17+ '366009196755', # salgado
18+ '036590675370', # jml
19 # ...anyone else want in on the fun?
20 )
21
22
23=== modified file 'lib/devscripts/ec2test/instance.py'
24--- lib/devscripts/ec2test/instance.py 2010-02-16 20:07:09 +0000
25+++ lib/devscripts/ec2test/instance.py 2010-03-22 15:24:38 +0000
26@@ -560,6 +560,7 @@
27 'ec2-register',
28 '--private-key=%s' % self.local_pk,
29 '--cert=%s' % self.local_cert,
30+ '--name=%s' % (name,),
31 manifest_path,
32 ]
33 self.log("Executing command: %s" % ' '.join(cmd))