You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2010/07/09 01:21:35 UTC
svn commit: r962080 -
/incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb
Author: lutter
Date: Thu Jul 8 23:21:35 2010
New Revision: 962080
URL: http://svn.apache.org/viewvc?rev=962080&view=rev
Log:
Add reasonable defaults to launched instances.
Modified:
incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb
Modified: incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb?rev=962080&r1=962079&r2=962080&view=diff
==============================================================================
--- incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb (original)
+++ incubator/deltacloud/trunk/drivers/ec2/lib/ec2_driver.rb Thu Jul 8 23:21:35 2010
@@ -232,12 +232,14 @@ class Ec2Driver < DeltaCloud::BaseDriver
state = ec2_instance[:aws_state].upcase
state_key = state.downcase.underscore.to_sym
+ realm_id = ec2_instance[:aws_availability_zone]
+ (realm_id = nil ) if ( realm_id == '' )
Instance.new( {
:id=>ec2_instance[:aws_instance_id],
:state=>ec2_instance[:aws_state].upcase,
:image_id=>ec2_instance[:aws_image_id],
:owner_id=>ec2_instance[:aws_owner],
- :realm_id=>ec2_instance[:aws_availability_zone],
+ :realm_id=>realm_id,
:public_addresses=>( ec2_instance[:dns_name] == '' ? [] : [ec2_instance[:dns_name]] ),
:private_addresses=>( ec2_instance[:private_dns_name] == '' ? [] : [ec2_instance[:private_dns_name]] ),
:flavor_id=>ec2_instance[:aws_instance_type].gsub( /\./, '-'),