ec2launcher 1.0.7 → 1.0.8

data/CHANGELOG.md

@@ -1,11 +1,18 @@
-## 1.0.7 (18-July-2012)
+## 1.0.8
+
+* Create instance with security group ids, instead of security group names. Fixes problem when launching an instance into a VPC with a security group that exists with the same name in the public cloud and in the vpc.
+* Automatically find security group ids from names, given a subnet.
+* Display private ip adress after launching.
+* Overhaul environment inheritance.
+
+## 1.0.7 
 
 * Fixed problem with inheriting from default environment.
 
-## 1.0.6 (18-July-2012)
+## 1.0.6
 
 * Update environment inheritence to merge (instead of replace) gems, packages, roles, commands and security groups.
 
-## 1.0.5 (18-July-2012)
+## 1.0.5
 
 * Fixed bug with resolving environment names when using an environment alias.

data/lib/ec2launcher/environment.rb

@@ -20,6 +20,7 @@ module EC2Launcher
 			@postcommands = []
 			@roles = []
 			@security_groups = []
+
 		end
 
 		def environment(name)
@@ -209,6 +210,7 @@ module EC2Launcher
 			@email_notifications = other_env.email_notifications unless other_env.email_notifications.nil?
 			@key_name = other_env.key_name unless other_env.key_name.nil?
 			@subnet = other_env.subnet unless other_env.subnet.nil?
+			@shortname = other_env.short_name unless other_env.short_name.nil?
 	end
 
 		def load(dsl)

data/lib/ec2launcher/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2012 Sean Laurent
 #
 module Ec2launcher
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/lib/ec2launcher.rb

@@ -68,6 +68,7 @@ module EC2Launcher
         end
       end
       @default_environment ||= EC2Launcher::Environment.new
+      @default_environment.inherit(nil)
 
       # Load other environments
       @environments = { }
@@ -102,8 +103,6 @@ module EC2Launcher
 
       # Process inheritance rules for environments
       @environments.values.each do |env|
-        next if env.inherit.nil?
-
         new_env = process_environment_inheritance(env)
         @environments[new_env.name] = new_env
       end
@@ -147,7 +146,20 @@ module EC2Launcher
       # Initialize AWS and create EC2 connection
       initialize_aws()
       @ec2 = AWS::EC2.new
-    
+
+      ##############################
+      # SUBNET
+      ##############################
+      subnet = nil
+      subnet = @application.subnet unless @application.subnet.nil?
+      subnet ||= @environment.subnet unless @environment.subnet.nil?
+
+      ec2_subnet = nil
+      unless subnet.nil?
+        # Find the matching EC2 subnet
+        ec2_subnet = @ec2.subnets[subnet]
+      end
+
       ##############################
       # AVAILABILITY ZONES
       ##############################
@@ -173,11 +185,26 @@ module EC2Launcher
       # SECURITY GROUPS
       ##############################
       security_groups = []
-      puts "ENV: #{@environment.security_groups}"
-      puts "APP: #{@application.security_groups_for_environment(@environment.name)}"
       security_groups += @environment.security_groups unless @environment.security_groups.nil?
       security_groups += @application.security_groups_for_environment(@environment.name)
 
+      # Build mapping of existing security group names to security group objects
+      sg_map = { }
+      AWS.start_memoizing
+      @ec2.security_groups.each do |sg|
+        unless ec2_subnet.nil?
+          next unless ec2_subnet.vpc_id == sg.vpc_id
+        end
+        sg_map[sg.name] = sg
+      end
+      AWS.stop_memoizing
+
+      # Convert security group names to security group ids
+      security_group_ids = []
+      security_groups.each do |sg_name|
+        security_group_ids << sg_map[sg_name].security_group_id
+      end
+
       ##############################
       # INSTANCE TYPE
       ##############################
@@ -243,13 +270,6 @@ module EC2Launcher
       roles += @environment.roles unless @environment.roles.nil?
       roles += @application.roles_for_environment(@environment.name)
 
-      ##############################
-      # Packages - preinstall
-      ##############################
-      subnet = nil
-      subnet = @application.subnet unless @application.subnet.nil?
-      subnet ||= @environment.subnet unless @environment.subnet.nil?
-
       ##############################
       # Gems - preinstall
       ##############################
@@ -334,20 +354,20 @@ rm -f /tmp/runurl"
       ##############################
       puts
       puts "Availability zone: #{availability_zone}"
-      puts "Key name         : #{key_name}"
-      puts "Security groups  : #{security_groups.join(", ")}"
-      puts "Instance type    : #{instance_type}"
-      puts "Architecture     : #{instance_architecture}"
-      puts "AMI name         : #{ami.ami_name}"
-      puts "AMI id           : #{ami.ami_id}"
-      puts "Name             : #{hostname}"
-      puts "ELB              : #{elb_name}" if elb_name
-      puts "Chef PEM         : #{chef_validation_pem_url}"
-      puts "AWS key file     : #{aws_keyfile}"
-      puts "Roles            : #{roles.join(', ')}"
-      puts "Gems             : #{gems.join(', ')}"
-      puts "Packages         : #{packages.join(', ')}"
-      puts "VPC Subnet       : #{subnet}" if subnet
+      puts "Key name            : #{key_name}"
+      puts "Security groups     : " + security_groups.collect {|name| "#{name} (#{sg_map[name].security_group_id})"}.join(", ")
+      puts "Instance type       : #{instance_type}"
+      puts "Architecture        : #{instance_architecture}"
+      puts "AMI name            : #{ami.ami_name}"
+      puts "AMI id              : #{ami.ami_id}"
+      puts "Name                : #{hostname}"
+      puts "ELB                 : #{elb_name}" if elb_name
+      puts "Chef PEM            : #{chef_validation_pem_url}"
+      puts "AWS key file        : #{aws_keyfile}"
+      puts "Roles               : #{roles.join(', ')}"
+      puts "Gems                : #{gems.join(', ')}"
+      puts "Packages            : #{packages.join(', ')}"
+      puts "VPC Subnet          : #{subnet}" if subnet
 
       unless block_device_mappings.empty?
         block_device_mappings.keys.sort.each do |key|
@@ -376,7 +396,7 @@ rm -f /tmp/runurl"
       ##############################
       # Launch the new intance
       ##############################
-      instance = launch_instance(hostname, ami.ami_id, availability_zone, key_name, security_groups, instance_type, user_data, block_device_mappings, block_device_tags, subnet)
+      instance = launch_instance(hostname, ami.ami_id, availability_zone, key_name, security_group_ids, instance_type, user_data, block_device_mappings, block_device_tags, subnet)
 
       ##############################
       # ELB
@@ -391,6 +411,7 @@ rm -f /tmp/runurl"
       puts "Instance id: #{instance.id}"
       puts "Public dns : #{instance.public_dns_name}"
       puts "Private dns: #{instance.private_dns_name}"
+      puts "Private ip : #{instance.private_ip_address}"
       puts "********************"    
     end
 
@@ -593,7 +614,7 @@ rm -f /tmp/runurl"
     # @param [String] ami_id id for the AMI to use.
     # @param [String] availability_zone EC2 availability zone to use
     # @param [String] key_name EC2 SSH key to use.
-    # @param [Array<String>] security_groups list of security groups.
+    # @param [Array<String>] security_group_ids list of security groups ids
     # @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. 
@@ -601,7 +622,7 @@ rm -f /tmp/runurl"
     # @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_groups, 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, instance_type, user_data, block_device_mappings = nil, block_device_tags = nil, vpc_subnet = nil)
       puts "Launching instance..."
       new_instance = nil
       run_with_backoff(30, 1, "launching instance") do
@@ -609,7 +630,7 @@ rm -f /tmp/runurl"
           :image_id => ami_id,
           :availability_zone => availability_zone,
           :key_name => key_name,
-          :security_groups => security_groups,
+          :security_group_ids => security_group_ids,
           :user_data => user_data,
           :instance_type => instance_type,
           :block_device_mappings => block_device_mappings,
@@ -686,15 +707,9 @@ rm -f /tmp/runurl"
         return nil
       end
 
-      new_env = Marshal::load(Marshal.dump(default_environment)) unless default_environment.nil?
-      new_env ||= EC2Launcher::Environment.new
-
       load_env = EC2Launcher::Environment.new
       load_env.load(File.read(name))
-
-      new_env.merge(load_env)
-
-      new_env
+      load_env
     end
 
     # Attempts to build a list of valid directories.
@@ -746,10 +761,13 @@ rm -f /tmp/runurl"
     end
 
     def process_environment_inheritance(env)
-        return env if env.inherit.nil?
-
         # Find base environment
-        base_env = @environments[env.inherit]
+        base_env = nil
+        if env.inherit.nil?
+          base_env = @default_environment
+        else
+          base_env = @environments[env.inherit]
+        end
         abort("Invalid inheritance '#{env.inherit}' in #{env.name}") if base_env.nil?
 
         new_env = nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors: