From 3f6c80a0e0ccc0ee8c41a81d5f839315255402ee Mon Sep 17 00:00:00 2001
From: "geemus (Wesley Beary)" <wbeary@engineyard.com>
Date: Wed, 3 Mar 2010 16:53:31 -0800
Subject: [PATCH] simplify and fix flavor assignment on EC2::Server

---
 lib/fog/aws/models/ec2/server.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/fog/aws/models/ec2/server.rb b/lib/fog/aws/models/ec2/server.rb
index 25ae83ac1..b9ee0d8b7 100644
--- a/lib/fog/aws/models/ec2/server.rb
+++ b/lib/fog/aws/models/ec2/server.rb
@@ -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