ironfan 4.7.1 → 4.7.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.7.2
+* elastic_ip: ensuring that elastic IPs work with VPC instances (thanks @schade)
+
 # v4.7.1
 * Cleaning up omnibus usage to link embedded bin, ruby into default $PATHs, rather than use /etc/environment to try tweaking (doesn't hit a large number of programs)
 * Launched machines should announce their state as "started"

data/VERSION

@@ -1 +1 @@
-4.7.1
+4.7.2

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.7.1"
+  s.version = "4.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-12-20"
+  s.date = "2013-01-10"
   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/elastic_ip.rb

@@ -50,12 +50,17 @@ module Ironfan
         #
 
         def self.save!(computer)
-          return unless (computer.created? and not computer.server.ec2.elastic_ip.nil?)
-          elastic_ip = computer.server.ec2.elastic_ip
+          return unless computer.created?
+          return unless elastic_ip = computer.server.ec2.elastic_ip
+          return unless recall? elastic_ip
           Ironfan.step(computer.name, "associating Elastic IP #{elastic_ip}", :blue)
           Ironfan.unless_dry_run do
             Ironfan.safely do
-              Ec2.connection.associate_address( computer.machine.id, elastic_ip )
+              vpc           = computer.server.ec2.vpc
+              allocation_id = recall(elastic_ip).allocation_id
+              raise "#{elastic_ip} is only for non-VPC instances" if vpc and allocation_id.nil?
+              raise "#{elastic_ip} is only for VPC instances"     if vpc.nil? and allocation_id
+              Ec2.connection.associate_address( computer.machine.id, elastic_ip, nil, allocation_id )
             end
           end
         end

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

@@ -240,8 +240,7 @@ module Ironfan
 
           # VPC security_groups can only be addressed by id (not name)
           description[:security_group_ids] = cloud.security_groups.keys.map do |g|
-            group_name = cloud.vpc.nil? ? g.to_s : "#{cloud.vpc}:#{g}"
-            SecurityGroup.recall(group_name).group_id
+            SecurityGroup.recall( SecurityGroup.group_name_with_vpc(g,cloud.vpc) ).group_id
           end
 
           description[:iam_server_certificates] = cloud.iam_server_certificates.values.map do |cert|

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.7.1
+  version: 4.7.2
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-20 00:00:00 Z
+date: 2013-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -282,7 +282,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 580195916744630251
+      hash: -3116104857531814331
       segments: 
       - 0
       version: "0"