awsborn 0.4.0 → 0.5.0

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+awsborn.log

data/README.mdown

@@ -62,8 +62,8 @@ Servers take five different directives:
 
 * `instance_type` -- a symbol.  One of `:m1_small`, `:m1_large`, `:m1_xlarge`,
   `:m2_2xlarge`, `:m2_4xlarge`, `:c1_medium`, and `:c1_xlarge`.
-* `image_id` -- a valid EC2 AMI.  Specify `:sudo_user` as an option if the AMI
-  does not allow you to log in as root.
+* `image_id` -- a valid EC2 AMI or a hash `{:i386 => 'ami-3232', :x64 => 'ami-6464'}`
+  Specify `:sudo_user` as an option if the AMI does not allow you to log in as root.
 * `security_group` -- a security group that you own.
 * `keys` -- one or more globs to public ssh key files.  When the servers are running,
   `root` will be able to log in using any one of these keys.
@@ -103,6 +103,7 @@ Keys that override server type settings:
 * `:security_group`
 * `:keys`
 * `:bootstrap_script`
+* `:image_id`
 
 ### Launching a cluster
 
@@ -233,7 +234,13 @@ Other rake tasks include:
 
 ## Bugs and surprising features
 
-No bugs are known at this time.
+* There is a race condition in launch: Immediately after the launch request (`launch_instance`) we
+  call `instance_running?`, but occasionally, AWS will not recognise the instance id yet
+  (`InvalidInstanceID.NotFound: The instance ID 'i-e9005283' does not exist`)
+* Running with `rake` suppresses stack traces which makes it hard to debug rare errors.  The rake
+  tasks or entry points should catch exceptions and print the stack trace.
+* `t1_micro` instances will select an i386 image when `image_id` is specified as a hash.  To run
+  them with x64 images, specify the image name on the server directive.
 
 ### Untested features
 
@@ -246,8 +253,6 @@ No bugs are known at this time.
 * Hack RightAws to verify certificates.
 * Elastic Load Balancing.
 * Launch servers in parallel.
-* Make `image_id` a hash with different AMIs for different instance types.
-* Make `image_id` overridable per server.
 
 
 ## Note on Patches/Pull Requests

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lib/awsborn/rake.rb

@@ -11,7 +11,10 @@ module Awsborn
       task :all => [:start, "chef:run"]
       task :default => :all
 
-      desc "Start all servers (or host=name1,name2)."
+      desc "Like 'all' but with chef debugging on."
+      task :debug => ["chef:set_chef_debug", :all]
+
+      desc "Start all servers (or host=name1,name2) but don't run chef."
       task :start do |t,args|
         hosts = args[:host] && args[:host].split(',')
         default_cluster.launch hosts

data/lib/awsborn/server.rb

@@ -13,6 +13,10 @@ module Awsborn
         @children ||= []
         @children << klass
       end
+      # Set image_id.  Examples:
+      #   image_id 'ami-123123'
+      #   image_id 'ami-123123', :sudo_user => 'ubuntu'
+      #   image_id :i386 => 'ami-323232', :x64 => 'ami-646464', :sudo_user => 'ubuntu'
       def image_id (*args)
         unless args.empty?
           @image_id = args.first
@@ -218,7 +222,17 @@ module Awsborn
         volume.is_a?(Array) && volume.last == :format
       end
       def image_id
-        self.class.image_id
+        return @options[:image_id] if @options[:image_id]
+        tmp = self.class.image_id
+        tmp.is_a?(String) ? tmp : tmp[architecture]
+      end
+      def architecture
+        string = constant(instance_type)
+        case
+        when INSTANCE_TYPES_32_BIT.include?(string) then :i386
+        when INSTANCE_TYPES_64_BIT.include?(string) then :x64
+        else raise "Don't know if #{instance_type} is i386 or x64"
+        end
       end
       def instance_type
         @options[:instance_type] || self.class.instance_type
@@ -271,7 +285,9 @@ module Awsborn
       eu-west-1a eu-west-1b
       ap-southeast-1a ap-southeast-1b
     ]
-    INSTANCE_TYPES = %w[m1.small m1.large m1.xlarge m2.xlarge m2.2xlarge m2.4xlarge c1.medium c1.xlarge]
+    INSTANCE_TYPES_32_BIT = %w[m1.small c1.medium t1.micro]
+    INSTANCE_TYPES_64_BIT = %w[m1.large m1.xlarge m2.xlarge m2.2xlarge m2.4xlarge c1.xlarge cc1.4xlarge t1.micro]
+    INSTANCE_TYPES = (INSTANCE_TYPES_32_BIT + INSTANCE_TYPES_64_BIT).uniq
     SYMBOL_CONSTANT_MAP = (AVAILABILITY_ZONES + INSTANCE_TYPES).inject({}) { |memo,str| memo[str.tr('-.','_').to_sym] = str; memo }
 
     def constant (symbol)

data/spec/server_spec.rb

@@ -6,6 +6,11 @@ class SampleServer < Awsborn::Server
   keys :all
 end
 
+class BigAndSmallServer < Awsborn::Server
+  instance_type :m1_small
+  image_id :x64 => 'ami-big', :i386 => 'ami-small'
+end
+
 describe Awsborn::Server do
   before(:each) do
     @server = SampleServer.new :sample, :zone => :eu_west_1a, :disk => {:sdf => "vol-aaaaaaaa"}
@@ -20,11 +25,28 @@ describe Awsborn::Server do
     end
   end
 
-  # TODO
-  context "first of all" do
-    it "should have a connection to the EU service point"
-    
+  describe "image_id" do
+    it "should use a given string" do
+      @server.image_id.should == 'ami-2fc2e95b'
+    end
+    it "should use the i386 image for a small server" do
+      server = BigAndSmallServer.new :sample, :zone => :eu_west_1a, :disk => {:sdf => "vol-a"}, :instance_type => :m1_small
+      server.image_id.should == 'ami-small'
+    end
+    it "should use the i386 image for a micro server (which could use either)" do
+      server = BigAndSmallServer.new :sample, :zone => :eu_west_1a, :disk => {:sdf => "vol-a"}, :instance_type => :t1_micro
+      server.image_id.should == 'ami-small'
+    end
+    it "should use the x64 image for a big server" do
+      server = BigAndSmallServer.new :sample, :zone => :eu_west_1a, :disk => {:sdf => "vol-a"}, :instance_type => :m1_large
+      server.image_id.should == 'ami-big'
+    end
   end
+
+  # TODO
+  # context "first of all" do
+  #   it "should have a connection to the EU service point"
+  # end
   
   context "#launch when not started" do
     before(:each) do

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - David Vrensk
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 +02:00
+date: 2010-09-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency