ec2launcher 1.1.1 → 1.1.2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.2
+
+* Added support for specifying an IAM Instance Profile through the environment and/or application.
+
 ## 1.1.1
 
 * Change to calling Bash directly in startup script, instead of running Bash in sh compatibility mode.

data/lib/ec2launcher/dsl/application.rb

@@ -41,6 +41,7 @@ module EC2Launcher
 			dsl_accessor :availability_zone
 			dsl_accessor :basename
 			dsl_accessor :inherit
+			dsl_accessor :iam_profile
 			dsl_accessor :instance_type
 			dsl_accessor :name_suffix
 			dsl_accessor :subnet
@@ -157,6 +158,7 @@ module EC2Launcher
 					other_server.elb.keys.each {|env_name| @elb[env_name] = other_server.elb[env_name] } 
 				end
 				
+				@iam_profile = other_server.iam_profile unless other_server.iam_profile.nil?
 				@instance_type = other_server.instance_type unless other_server.instance_type.nil?
 				@name_suffix = other_server.name_suffix unless other_server.name_suffix.nil?
 				

data/lib/ec2launcher/dsl/environment.rb

@@ -22,6 +22,7 @@ module EC2Launcher
 			dsl_accessor :chef_validation_pem_url
 			dsl_accessor :domain_name
 			dsl_accessor :gem_path
+			dsl_accessor :iam_profile
 			dsl_accessor :inherit
 			dsl_accessor :key_name
 			dsl_accessor :knife_path
@@ -89,6 +90,7 @@ module EC2Launcher
 				@domain_name = other_env.domain_name unless other_env.domain_name.nil?
 				@email_notifications = other_env.email_notifications unless other_env.email_notifications.nil?
 				@gem_path = other_env.gem_path unless other_env.gem_path.nil?
+				@iam_profile = other_env.iam_profile unless other_env.iam_profile.nil?
 				@key_name = other_env.key_name unless other_env.key_name.nil?
 				@knife_path = other_env.knife_path unless other_env.knife_path.nil?
 				@ruby_path = other_env.ruby_path unless other_env.ruby_path.nil?

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module EC2Launcher
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/ec2launcher.rb

@@ -169,6 +169,12 @@ module EC2Launcher
         exit 3
       end
 
+      ##############################
+      # IAM PROFILE
+      ##############################
+      iam_profile = @environment.iam_profile
+      iam_profile ||= @application.iam_profile
+
       ##############################
       # INSTANCE TYPE
       ##############################
@@ -280,6 +286,7 @@ module EC2Launcher
       @log.info "Availability zone: #{availability_zone}"
       @log.info "Key name            : #{key_name}"
       @log.info "Security groups     : " + security_groups.collect {|name| "#{name} (#{sg_map[name].security_group_id})"}.join(", ")
+      @log.info "IAM profile         : #{iam_profile}" if iam_profile
       @log.info "Instance type       : #{instance_type}"
       @log.info "Architecture        : #{instance_architecture}"
       @log.info "AMI name            : #{ami.ami_name}"
@@ -339,7 +346,7 @@ module EC2Launcher
         block_device_tags = block_device_builder.generate_device_tags(fqdn_names[i], short_hostnames[i], @environment.name, @application.block_devices)
         user_data = build_launch_command(fqdn_names[i], short_hostnames[i], roles, chef_validation_pem_url, aws_keyfile, gems, packages, email_notifications)
 
-        instance = launch_instance(fqdn_names[i], ami.ami_id, availability_zone, key_name, security_group_ids, instance_type, user_data, block_device_mappings, block_device_tags, subnet)
+        instance = launch_instance(fqdn_names[i], ami.ami_id, availability_zone, key_name, security_group_ids, iam_profile, instance_type, user_data, block_device_mappings, block_device_tags, subnet)
         instances << instance
 
         public_dns_name = get_instance_dns(instance, true)
@@ -504,6 +511,7 @@ module EC2Launcher
     # @param [String] availability_zone EC2 availability zone to use
     # @param [String] key_name EC2 SSH key to use.
     # @param [Array<String>] security_group_ids list of security groups ids
+    # @param [String, nil] iam_profile The name or ARN of an IAM instance profile. May be nil.
     # @param [String] instance_type EC2 instance type.
     # @param [String] user_data command data to store pass to the instance in the EC2 user-data field.
     # @param [Hash<String,Hash<String, String>, nil] block_device_mappings mapping of device names to block device details. 
@@ -511,32 +519,26 @@ module EC2Launcher
     # @param [Hash<String,Hash<String, String>>, nil] block_device_tags mapping of device names to hash objects with tags for the new EBS block devices.
     #
     # @return [AWS::EC2::Instance] newly created EC2 instance or nil if the launch failed.
-    def launch_instance(hostname, ami_id, availability_zone, key_name, security_group_ids, instance_type, user_data, block_device_mappings = nil, block_device_tags = nil, vpc_subnet = nil)
+    def launch_instance(hostname, ami_id, availability_zone, key_name, security_group_ids, iam_profile, instance_type, user_data, block_device_mappings = nil, block_device_tags = nil, vpc_subnet = nil)
       @log.warn "Launching instance... #{hostname}"
       new_instance = nil
       run_with_backoff(30, 1, "launching instance") do
-        if block_device_mappings.nil? || block_device_mappings.keys.empty?
-          new_instance = @ec2.instances.create(
+        launch_mapping = {
             :image_id => ami_id,
             :availability_zone => availability_zone,
             :key_name => key_name,
             :security_group_ids => security_group_ids,
             :user_data => user_data,
-            :instance_type => instance_type,
-            :subnet => vpc_subnet
-          )
-        else
-          new_instance = @ec2.instances.create(
-            :image_id => ami_id,
-            :availability_zone => availability_zone,
-            :key_name => key_name,
-            :security_group_ids => security_group_ids,
-            :user_data => user_data,
-            :instance_type => instance_type,
-            :block_device_mappings => block_device_mappings,
-            :subnet => vpc_subnet
-          )
+            :instance_type => instance_type
+        }
+        unless block_device_mappings.nil? || block_device_mappings.keys.empty?
+          launch_mapping[:block_device_mappings] = block_device_mappings
         end
+
+        launch_mapping[:iam_profile] = iam_profile if iam_profile
+        launch_mapping[:subnet] = vpc_subnet if vpc_subnet
+
+        new_instance = @ec2.instances.create(launch_mapping)
       end
       sleep 5
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-13 00:00:00.000000000 Z
+date: 2012-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -107,4 +107,3 @@ signing_key:
 specification_version: 3
 summary: Tool to launch EC2 instances.
 test_files: []
-has_rdoc: