ec2launcher 1.0.12 → 1.0.13

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.13
+
+* Fix use of security groups when launching an instance into the public cloud with a security group that is defined with the same name in both the public cloud and a VPC.
+
 ## 1.0.12
 
 * Embed runurl and setup.rb scripts in user-data to avoid having to retrieve them.

data/lib/ec2launcher.rb

@@ -164,7 +164,9 @@ module EC2Launcher
       sg_map = { }
       AWS.start_memoizing
       @ec2.security_groups.each do |sg|
-        unless ec2_subnet.nil?
+        if ec2_subnet.nil?
+          next unless sg.vpc_id.nil?
+        else
           next unless ec2_subnet.vpc_id == sg.vpc_id
         end
         sg_map[sg.name] = sg

data/lib/ec2launcher/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2launcher
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk