ACK, thanks and nice catch - pushing this with a couple additional
changes to show.html.haml and index.xml.haml which weren't displaying
the key/passwords (if present for given driver).
marios
On 26/05/11 20:38, Chris Lalancette wrote:
The instance view expects an "instance.keyname" as part of
an instance object, but the EC2 driver was setting
"instance.key_name". This means that the keyname data
was never being exported. Fix this to "keyname".
Signed-off-by: Chris Lalancette<[email protected]>
---
server/lib/deltacloud/drivers/ec2/ec2_driver.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
index 14c5829..0c0471a 100644
--- a/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
+++ b/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
@@ -697,7 +697,7 @@ module Deltacloud
:image_id => instance[:aws_image_id],
:owner_id => instance[:aws_owner],
:actions =>
instance_actions_for(convert_state(instance[:aws_state])),
- :key_name => instance[:ssh_key_name],
+ :keyname => instance[:ssh_key_name],
:launch_time => instance[:aws_launch_time],
:instance_profile =>
InstanceProfile.new(instance[:aws_instance_type]),
:realm_id => instance[:aws_availability_zone],
