aws-ami 0.0.3 → 0.0.7

data/bin/aws-ami

@@ -3,7 +3,6 @@
 require "rubygems"
 require File.join(File.dirname(__FILE__), '..', 'lib', 'aws_ami')
 
-
 require 'optparse'
 
 options = {}
@@ -38,6 +37,10 @@ OptionParser.new do |opts|
     options[:publish_to_account] = v
   end
 
+  opts.on("-t", "--timeout [TIMEOUT]", "Change default timeout of waiting install script run finished, default is 600 seconds") do |t|
+    options[:timeout] = t
+  end
+
   opts.on('-h', '--help') do
     puts opts
     exit(0)
@@ -59,16 +62,5 @@ if options[:dry]
   exit
 end
 
-[:name, :region, :install_script, :key_name, :base_ami].each do |n|
-  raise "Must provide #{n}" unless options[n]
-end
-
-# ENV variables:
-#    AWS_ACCESS_KEY_ID
-#    AWS_SECRET_ACCESS_KEY
-
 ami = AWS::AMI.new(options)
-ami.build(options[:name],
-          'KeyName' => options[:key_name],
-          'InstallScript' => File.read(options[:install_script]),
-          "BaseAMI" => YAML.load(File.read(options[:base_ami]))[options[:region]])
+ami.build

data/lib/aws_ami/ami.rb

@@ -3,31 +3,47 @@ require 'logger'
 
 module AWS
   class AMI
+    # name: AMI name
     # region: aws region of the new AMI
+    # key_name: AWS EC2 ssh key name for accessing ec2 instance for debuging problems
+    # install_script: a script file can be run on the ec2 instance that is launched from base ami to install packages
+    # base_ami: a yml file describes base AMI used for building new AMI for each region
+    # timeout: Timeout for running install script, default 600
+    # publish_to_account: publish the AMI to this account if need
     # assume_yes: true for deleting stack when creating image failed
     def initialize(options={})
-      @assume_yes = options[:assume_yes]
-      @region = options[:region]
+      @name = options[:name] || raise("Must have a name for the AMI")
+      @region = options[:region] || raise("Must specify aws region")
+      @key_name = options[:key_name] || raise("Please specify aws ssh key name, so that you can debug problem when something goes wrong")
+      @install_script = File.read(options[:install_script]) || raise("Must provide install packages script file")
+
+      @base_ami = YAML.load(File.read(options[:base_ami]))[@region] || raise("Must provide base ami yml file for each region")
+
+      @timeout = options[:timeout] || '600'
+      @assume_yes = options[:assume_yes] || false
       @publish_to_account = options[:publish_to_account]
       @test = options[:test]
     end
 
-    # name: new AMI name, for example: mingle-saas-base
-    # parameters:
-    #   BaseAMI: the base AMI id for the new AMI, for example:
-    #     "ami-0d153248" for the "ubuntu/images/ebs/ubuntu-precise-12.04-amd64-server-20121001" in us-west-1 region
-    #   KeyName: the ssh key name for accessing the ec2 instance while building the AMI, this is only used when you need to debug problems
-    #   InstallScript: the script installs everything need for the AMI, from 2048 to 16k bytes depending on the base ami provided
-    def build(name, parameters)
-      stack = cloudformation.stacks.create("build-#{name}-ami",
+    def build
+      stack = cloudformation.stacks.create("build-#{@name}-ami",
                                            load_formation,
                                            :disable_rollback => true,
-                                           :parameters => parameters)
+                                           :parameters => {
+                                             'Timeout' => @timeout,
+                                             'KeyName' => @key_name,
+                                             'InstallScript' => @install_script,
+                                             "BaseAMI" => @base_ami
+                                           })
       logger.info "creating stack"
       wait_until_created(stack)
       begin
         instance_id = stack.resources['EC2Instance'].physical_resource_id
+        instance = ec2.instances[instance_id]
         if @test
+          puts "Build AMI Stack created"
+          puts "EC2 instance dns name: #{instance.dns_name}, ip address: #{instance.ip_address}"
+          puts "continue to create AMI Image? [y/n]"
           unless gets.strip == 'y'
             logger.info "delete stack and stop"
             stack.delete
@@ -36,7 +52,7 @@ module AWS
           logger.info "continue to create image"
         end
         logger.info "creating image"
-        image = ec2.instances[instance_id].create_image(name, :description => "Created at #{Time.now}")
+        image = instance.create_image(@name, :description => "Created at #{Time.now}")
         sleep 2 until image.exists?
         logger.info "image #{image.id} state: #{image.state}"
         sleep 5 until image.state != :pending
@@ -63,7 +79,7 @@ module AWS
         logger.info "add permissions for #{@publish_to_account}"
         image.permissions.add(@publish_to_account.gsub(/-/, ''))
       end
-      logger.info "Image #{name}[#{image.id}] created"
+      logger.info "Image #{@name}[#{image.id}] created"
     end
 
     private

data/lib/aws_ami/formation.json

@@ -13,6 +13,11 @@
         "BaseAMI": {
             "Description": "Base AMI for the new AMI",
             "Type": "String"
+        },
+        "Timeout": {
+            "Description": "Timeout for waiting EC2 instance complete the install script",
+            "Type": "Number",
+            "Default": "600"
         }
     },
 
@@ -56,7 +61,7 @@
             "Type" : "AWS::CloudFormation::WaitCondition",
             "Properties" : {
                 "Handle" : { "Ref" : "myWaitHandle" },
-                "Timeout" : "300"
+                "Timeout" : { "Ref" : "Timeout" }
             }
         }
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-ami
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -42,7 +42,7 @@ files:
 homepage: http://github.com/ThoughtWorksStudios/aws-ami
 licenses:
 - MIT
-post_install_message: run aws-ami -h for details how to use
+post_install_message: run 'aws-ami -h' for how to use
 rdoc_options: []
 require_paths:
 - lib
@@ -63,6 +63,6 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: AWS AMI toolsets for Ruby
+summary: A tool for creating AWS AMI from a base AMI and an install packages script
 test_files: []
 has_rdoc: