Merge lp:~smoser/euca2ools/fix-import-keypair into lp:euca2ools

[Scott Moser]

euca-import-keypair: fix importing keypairs

importkeypair was uploading the filename as the keypair content rather than
the file contents. Simple fix is to upload the file contents.

[Bastian Gebhardt (buzz-t)]

review: Approve

=== modified file 'euca2ools/commands/euca/importkeypair.py'
--- euca2ools/commands/euca/importkeypair.py	2011-08-12 00:22:21 +0000
+++ euca2ools/commands/euca/importkeypair.py	2011-12-15 14:58:43 +0000
@@ -47,10 +47,13 @@
                   optional=False)]
     
     def main(self):
+        fp = open(self.file_name)
+        key_material = fp.read()
+        fp.close()
         conn = self.make_connection_cli()
         return self.make_request_cli(conn, 'import_key_pair',
                                      key_name=self.key_name,
-                                     public_key_material=self.file_name)
+                                     public_key_material=key_material)
 
     def main_cli(self):
         keypair = self.main()