[MERGE] Various tweaks to ec2 stuff, and make it less windows only.

[John Arbash Meinel]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Robert Collins wrote:
> I've gotten up to speed on ec2 by using it to run bzr tests - 10m24
> seconds including instance startup, down from 40minutes for me locally.
> 
> Along the way, I found some things that may be useful to remember, so
> this patch does that.
> 
> -Rob
> 

>  You do need to have an RSA keypair to get the initial password for a
> -Windows machine, even though you can't use it to log in later.  As a quirk
> -of the tools(?) ``ec2-get-password`` needs the full path to the keypair
> -but ``ec2-add-keypair`` just wants part of the name.  I guess this is
> -distinct from the account identifier because the image is relatively
> -untrusted(?).  If the password is already set in the image, this shouldn't
> -be necessary.

v- "``ec2-get-password`` takes ...
                             ^
  password from Amazon
                ^
> +Windows machine, even though you can't use it to log in later.
> +``ec2-get-password`` take the full path to the private key to obtain the
> +password from amazon, and ``ec2-add-keypair`` creates a named keypair at
> +Amazon and returns the private path. One keypair is all that is needed.
> +This is distinct from the account identifier - likely due to the different
> +toolchains in use (the keypairs are used for unix ssh keys, and I (Robert)
> +suspect a rather unix friendly core at Amazon).
> +Once a custom image is made with a saved password, you can skip using 
> +``ec2-get-password`` (which is only needed for windows anyway).
>  
                                                  v
                                                  Windows


BB:tweak

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAknDpzEACgkQJdeBCYSNAAOv0gCgzV9GfWjVtBjEEwfu39TIKvBm
SiIAoIPpHdbdJ/NRX//HKrsfQoG2GE0O
=nKok
-----END PGP SIGNATURE-----