incubator-deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject svn commit: r1055015 - /incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
Date Tue, 04 Jan 2011 12:50:03 GMT
Author: mfojtik
Date: Tue Jan  4 12:50:03 2011
New Revision: 1055015

URL: http://svn.apache.org/viewvc?rev=1055015&view=rev
Log:
Look for keyname instead of key_name in the instance start options.

'keyname' is the key declared by the feature, so should be used.
The client already copies any value keyed by 'key_name' to 'keyname'.

Modified:
    incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb

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=1055015&r1=1055014&r2=1055015&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 Tue Jan  4
12:50:03 2011
@@ -179,7 +179,7 @@ module Deltacloud
           ec2 = new_client(credentials)
           instance_options = {}
           instance_options.merge!(:user_data => opts[:user_data]) if opts[:user_data]
-          instance_options.merge!(:key_name => opts[:key_name]) if opts[:key_name]
+          instance_options.merge!(:key_name => opts[:keyname]) if opts[:keyname]
           instance_options.merge!(:availability_zone => opts[:realm_id]) if opts[:realm_id]
           instance_options.merge!(:instance_type => opts[:hwp_id]) if opts[:hwp_id]
           instance_options.merge!(:group_ids => opts[:security_group]) if opts[:security_group]



Mime
View raw message