ironfan 4.11.2 → 4.11.3

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.11.3
+* Removing unnecessary check for groups (caused failures when in VPC)
+
 # v4.11.2
 * Several changes to ec2/machine, from earlier call of to_s during register call (thanks @brandonbell, @rottmanj)
   * testing for possible nil result from tags

data/VERSION

@@ -1 +1 @@
-4.11.2
+4.11.3

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.11.2"
+  s.version = "4.11.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-06-27"
+  s.date = "2013-07-13"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/ironfan/provider/ec2/security_group.rb

@@ -87,17 +87,17 @@ module Ironfan
               groups_to_create << dsl_group.name
 
               groups_to_create << dsl_group.group_authorized.map do |other_group|
-                most_appropriate_group_name(other_group, cloud.vpc, groups_that_should_exist)
+                most_appropriate_group_name(other_group, cloud.vpc)
               end
 
               groups_to_create << dsl_group.group_authorized_by.map do |other_group|
-                most_appropriate_group_name(other_group, cloud.vpc, groups_that_should_exist)
+                most_appropriate_group_name(other_group, cloud.vpc)
               end
 
               authorizations_to_ensure << dsl_group.group_authorized.map do |other_group|
                 {
-                  :grantor      => most_appropriate_group_name(dsl_group.name, cloud.vpc, groups_that_should_exist),
-                  :grantee      => most_appropriate_group_name(other_group, cloud.vpc, groups_that_should_exist),
+                  :grantor      => most_appropriate_group_name(dsl_group.name, cloud.vpc),
+                  :grantee      => most_appropriate_group_name(other_group, cloud.vpc),
                   :grantee_type => :group,
                   :range        => WIDE_OPEN,
                 }
@@ -105,8 +105,8 @@ module Ironfan
 
               authorizations_to_ensure << dsl_group.group_authorized_by.map do |other_group|
                 {
-                  :grantor      => most_appropriate_group_name(other_group, cloud.vpc, groups_that_should_exist),
-                  :grantee      => most_appropriate_group_name(dsl_group.name, cloud.vpc, groups_that_should_exist),
+                  :grantor      => most_appropriate_group_name(other_group, cloud.vpc),
+                  :grantee      => most_appropriate_group_name(dsl_group.name, cloud.vpc),
                   :grantee_type => :group,
                   :range        => WIDE_OPEN,
                 }
@@ -172,8 +172,8 @@ module Ironfan
           vpc_id.nil? ? name.to_s : "#{vpc_id}:#{name.to_s}"
         end
 
-        def self.most_appropriate_group_name(group, vpc_id, all_valid_groups)
-          all_valid_groups.include?(group_name_with_vpc(group, vpc_id)) ? group_name_with_vpc(group, vpc_id) : group
+        def self.most_appropriate_group_name(group, vpc_id)
+          vpc_id.present? ? group_name_with_vpc(group, vpc_id) : group
         end
 
         #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 4.11.2
+  version: 4.11.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -381,7 +381,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -334978853826199168
+      hash: 4157015172636706371
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: