From: marios <mar...@redhat.com>
https://issues.apache.org/jira/browse/DTACLOUD-438
Signed-off-by: marios <mar...@redhat.com>
---
server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
index 9c10ff8..476ae5e 100644
--- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
+++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
@@ -379,7 +379,11 @@ module Deltacloud
def create_key(credentials, opts={})
ec2 = new_client(credentials)
safely do
- convert_key(ec2.create_key_pair(opts[:key_name]))
+ if (opts[:public_key] && opts[:public_key].length >0)
+ convert_key(ec2.import_key_pair(opts[:key_name],
opts[:public_key]))
+ else
+ convert_key(ec2.create_key_pair(opts[:key_name]))
+ end
end
end
--
1.7.11.7
