kotovalexarian-likes-github
/
fog--fog
mirror of https://github.com/fog/fog.git
1
0
Fork 0
Code Releases Activity

simplify and fix flavor assignment on EC2::Server

This commit is contained in:
geemus (Wesley Beary) 2010-03-03 16:53:31 -08:00
parent 6905b0d28c
commit 3f6c80a0e0
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/fog/aws/models/ec2/server.rb
View File

@ -31,6 +31,7 @@ module Fog
def initialize(attributes)
@groups ||= ["default"]
@flavor_id ||= 'm1.small'
super
end
@ -56,7 +57,7 @@ module Fog
# end
def flavor_id
@flavor_id || @flavor && @flavor.id || 'm1.small'
@flavor && @flavor.id || @flavor_id
end
def flavor=(new_flavor)
@ -64,7 +65,7 @@ module Fog
end
def flavor
@flavor || connection.flavors.all.detect {|flavor| flavor.id == @flavor_id}
@flavor ||= connection.flavors.all.detect {|flavor| flavor.id == @flavor_id}
end
def key_pair
@ -106,7 +107,7 @@ module Fog
def save
requires :image_id
options = {'InstanceType' => flavor}
options = {'InstanceType' => flavor.id}
if @availability_zone
options['Placement.AvailabilityZone'] = @availability_zone
end