ironfan 4.4.2 → 4.4.3

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.4.3:
+* workaround to make ec2 regions respect the cluster's region/AZ preference
+* Making validation scope name prefix properly (fixes #201)
+
 # v4.4.2:
 * Support for intra-cluster ICMP and specs to prove it (thanks @nickmarden)
 * Knife bash completion script: see config/knife.bash.README.md for installation (thanks @schade)

data/VERSION

@@ -1 +1 @@
-4.4.2
+4.4.3

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.4.2"
+  s.version = "4.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2012-10-24"
+  s.date = "2012-10-31"
   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/chef/knife/ironfan_knife_common.rb

@@ -36,6 +36,7 @@ module Ironfan
       #
       ui.info("Inventorying servers in #{desc}")
       cluster   = Ironfan.load_cluster(cluster_name)
+      Chef::Config[:knife][:region] = cluster.servers.to_a.first.cloud(:ec2).region
       computers =  broker.discover! cluster
       Chef::Log.info("Inventoried #{computers.size} computers")
       #

data/lib/ironfan/dsl/ec2.rb

@@ -38,7 +38,7 @@ module Ironfan
         bit_str = "#{self.bits.to_i}-bit" # correct for legacy image info.
         keys = [region, bit_str, backing, image_name]
         info = Chef::Config[:ec2_image_info][ keys ]
-        ui.warn("Can't find image for #{[region, bits.to_s, backing, image_name].inspect}") if info.blank?
+        ui.warn("Can't find image for #{[region, bit_str, backing, image_name].inspect}") if info.blank?
         return info || {}
       end
 

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

@@ -130,7 +130,7 @@ module Ironfan
         def self.validate_resources!(computers)
           recall.each_value do |machine|
             next unless machine.users.empty? and machine.name
-            if machine.name.match("^#{computers.cluster.name}")
+            if machine.name.match("^#{computers.cluster.name}-")
               machine.bogus << :unexpected_machine
             end
             next unless machine.bogus?
@@ -204,6 +204,10 @@ module Ironfan
           errors["No AMI found"] = info if cloud.image_id.blank?
           errors['Missing client']      = info            unless computer.client?
           errors['Missing private_key'] = computer.client unless computer.private_key
+          #
+          all_asserted_regions = [Ec2.connection.region, cloud.region, Chef::Config[:knife][:region], Ironfan.chef_config[:region]].compact.uniq
+          errors["mismatched region"] = all_asserted_regions unless all_asserted_regions.count == 1
+          #
           errors
         end
 

metadata

@@ -2,7 +2,7 @@
 name: ironfan
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 4.4.2
+  version: 4.4.3
 platform: ruby
 authors: 
 - Infochimps
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-24 00:00:00 Z
+date: 2012-10-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -281,7 +281,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2266640739538756460
+      hash: -706290733514954892
       segments: 
       - 0
       version: "0"