You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by ma...@apache.org on 2011/05/27 12:02:13 UTC
svn commit: r1128231 - in /incubator/deltacloud/trunk/server:
lib/deltacloud/drivers/ec2/ec2_driver.rb views/instances/index.xml.haml
views/instances/show.html.haml
Author: marios
Date: Fri May 27 10:02:12 2011
New Revision: 1128231
URL: http://svn.apache.org/viewvc?rev=1128231&view=rev
Log:
Fix key/user+password listings
Modified:
incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
incubator/deltacloud/trunk/server/views/instances/index.xml.haml
incubator/deltacloud/trunk/server/views/instances/show.html.haml
Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb?rev=1128231&r1=1128230&r2=1128231&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb Fri May 27 10:02:12 2011
@@ -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],
Modified: incubator/deltacloud/trunk/server/views/instances/index.xml.haml
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/views/instances/index.xml.haml?rev=1128231&r1=1128230&r2=1128231&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/views/instances/index.xml.haml (original)
+++ incubator/deltacloud/trunk/server/views/instances/index.xml.haml Fri May 27 10:02:12 2011
@@ -23,3 +23,16 @@
%private_addresses
- instance.private_addresses.each do |address|
%address #{address}
+ - if driver_has_auth_features?
+ %authentication{ :type => driver_auth_feature_name }
+ - if instance.authn_feature_failed?
+ %error #{instance.authn_error}
+ - else
+ - if driver_auth_feature_name == 'password'
+ %login
+ %username #{instance.username}
+ %password #{instance.password}
+ - if driver_auth_feature_name == 'key'
+ %login
+ %keyname #{instance.keyname}
+
Modified: incubator/deltacloud/trunk/server/views/instances/show.html.haml
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/views/instances/show.html.haml?rev=1128231&r1=1128230&r2=1128231&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/views/instances/show.html.haml (original)
+++ incubator/deltacloud/trunk/server/views/instances/show.html.haml Fri May 27 10:02:12 2011
@@ -45,6 +45,11 @@
%dt Password
%dd
= @instance.password
+ - if @instance.keyname
+ %di
+ %dt Key
+ %dd
+ = @instance.keyname
%di
%dt
%dd