ironfan 4.11.0 → 4.11.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v4.11.1
+* Added fall-back Chef::Client loading, if Solr index has fallen behind (thanks @brandonbell)
+* Moved logging of resource loading into Resource.register, instead of individual resources
+
 # v4.11.0
 * Changed chef client semantics, to drop problematic deprecated "name" attribute
 * Adding `announcements` to RDS instances

data/Gemfile.lock

@@ -2,7 +2,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
-    builder (3.2.0)
+    builder (3.2.2)
     bunny (0.7.9)
     chef (10.26.0)
       bunny (>= 0.6.0, < 0.8.0)
@@ -22,11 +22,12 @@ GEM
       treetop (~> 1.4.9)
       uuidtools
       yajl-ruby (~> 1.1)
-    chef-zero (1.1.3)
+    chef-zero (1.5.1)
       hashie (~> 2.0)
+      json
       mixlib-log (~> 1.3)
       moneta (< 0.7.0)
-      puma (~> 2.0)
+      puma (~> 1.6)
     coderay (1.0.9)
     columnize (0.3.6)
     configliere (0.4.18)
@@ -35,7 +36,7 @@ GEM
     diff-lcs (1.2.4)
     erubis (2.7.0)
     excon (0.21.0)
-    ffi (1.8.1)
+    ffi (1.9.0)
     fog (1.10.1)
       builder
       excon (~> 0.20)
@@ -52,13 +53,13 @@ GEM
       configliere (>= 0.4.13)
       json
       multi_json (>= 1.1)
-    guard (1.8.0)
+    guard (1.8.1)
       formatador (>= 0.2.4)
       listen (>= 1.0.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-rspec (3.0.0)
+    guard-rspec (3.0.2)
       guard (>= 1.8)
       rspec (~> 2.13)
     guard-yard (2.1.0)
@@ -75,7 +76,7 @@ GEM
     json (1.5.4)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    listen (1.1.2)
+    listen (1.2.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
@@ -89,7 +90,7 @@ GEM
     mixlib-log (1.6.0)
     mixlib-shellout (1.1.0)
     moneta (0.6.0)
-    multi_json (1.7.3)
+    multi_json (1.7.7)
     net-scp (1.1.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.6.7)
@@ -98,7 +99,7 @@ GEM
     net-ssh-multi (1.1)
       net-ssh (>= 2.1.4)
       net-ssh-gateway (>= 0.99.0)
-    nokogiri (1.5.9)
+    nokogiri (1.5.10)
     ohai (6.16.0)
       ipaddress
       mixlib-cli
@@ -107,16 +108,16 @@ GEM
       mixlib-shellout
       systemu
       yajl-ruby
-    oj (2.0.12)
+    oj (2.1.2)
     polyglot (0.3.3)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    puma (2.0.1)
-      rack (>= 1.1, < 2.0)
+    puma (1.6.3)
+      rack (~> 1.2)
     rack (1.5.2)
-    rake (10.0.4)
+    rake (10.1.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
@@ -128,7 +129,7 @@ GEM
       trollop
     rdoc (4.0.1)
       json (~> 1.4)
-    redcarpet (2.2.2)
+    redcarpet (2.3.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.13.0)
@@ -158,7 +159,7 @@ GEM
     slop (3.4.5)
     systemu (2.5.2)
     thor (0.18.1)
-    treetop (1.4.12)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
     trollop (2.0)

data/VERSION

@@ -1 +1 @@
-4.11.0
+4.11.1

data/ironfan.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.11.0"
+  s.version = "4.11.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]

data/lib/ironfan/provider.rb

@@ -110,6 +110,7 @@ module Ironfan
       def self.remember(resource,options={})
         index = options[:id] || resource.name
         index += options[:append_id] if options[:append_id]
+        Chef::Log.debug("Loaded #{resource}")
         self.known[index] = resource
       end
 
@@ -117,7 +118,6 @@ module Ironfan
       def self.register(native)
         result = new(:adaptee => native) or return
         remember result
-        result
       end
 
       def self.recall?(id)

data/lib/ironfan/provider/chef/client.rb

@@ -45,11 +45,14 @@ module Ironfan
         # Discovery
         #
         def self.load!(cluster=nil)
-          query = "clientname:#{cluster ? '*' : cluster.name}-*"
-          ChefServer.search(:client, query) do |raw|
-            next unless raw.present?
-            client = register(raw)
-            Chef::Log.debug("Loaded #{client}")
+          Chef::ApiClient.list(true).each { |name, raw| client = register(raw) }
+          return unless cluster
+
+          # Fallback, for when Solr isn't indexing clients fast enough
+          cluster.servers.each do |s|
+            next if recall? s.full_name             # Already loaded
+            begin; register Chef::ApiClient.load(s.full_name)
+            rescue Net::HTTPServerException; end    # Doesn't exist
           end
         end
 
@@ -58,16 +61,15 @@ module Ironfan
         #
         def self.create!(computer)
           return if computer.client?
-          client = Client.new
-          client.name         computer.server.full_name
-          client.admin        false
+          client                = Client.new
+          client.name           computer.server.full_name
+          client.admin          false
 
-          params = {:name => client.name, :admin => client.admin, :private_key => true }
-          result = ChefServer.post_rest("clients", params)
-          client.private_key(result["private_key"])
+          result                = client.save
+          client.private_key    result["private_key"]
 
-          computer[:client] =  client
-          remember             client
+          computer[:client]     = client
+          remember              client
         end
 
         def self.destroy!(computer)

data/lib/ironfan/provider/chef/node.rb

@@ -91,7 +91,6 @@ module Ironfan
           ChefServer.search(:node, query) do |raw|
             next unless raw.present?
             node = register(raw)
-            Chef::Log.debug("Loaded #{node}")
           end
         end
 

data/lib/ironfan/provider/chef/role.rb

@@ -49,9 +49,7 @@ module Ironfan
         def self.load!(cluster=nil)
           query = cluster && "name:#{cluster.name}-*"
           ChefServer.search(:role,query) do |raw|
-            next unless raw.present?
-            role = register(raw)
-            Chef::Log.debug("Loaded #{role}")
+            register raw if raw.present?
           end
         end
 

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

@@ -61,7 +61,6 @@ module Ironfan
             else
               remember ebs
             end
-            Chef::Log.debug("Loaded #{ebs}")
           end
         end
 

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

@@ -3,14 +3,14 @@ module Ironfan
     class Ec2
 
       class ElasticIp < Ironfan::Provider::Resource
-      	delegate :addresses, :associate_address, :allocation_id, 
-            :allocation_id=, :allocate_address, :auto_elastic_ip, :destroy, 
-            :domain, :domain=, :describe_addresses, :disassociate_address, 
-            :domain, :id, :network_interface_id, :network_interface_id=, 
-            :public_ip, :public_ip=, :public_ip_address, :save, :server=, 
+      	delegate :addresses, :associate_address, :allocation_id,
+            :allocation_id=, :allocate_address, :auto_elastic_ip, :destroy,
+            :domain, :domain=, :describe_addresses, :disassociate_address,
+            :domain, :id, :network_interface_id, :network_interface_id=,
+            :public_ip, :public_ip=, :public_ip_address, :save, :server=,
             :server, :server_id, :server_id=,
         :to => :adaptee
- 
+
         def self.shared?()              true;                               end
         def self.multiple?()            false;                              end
         def self.resource_type()        :elastic_ip;                        end
@@ -24,7 +24,6 @@ module Ironfan
         def self.load!(cluster=nil)
           Ec2.connection.addresses.each do |eip|
             register eip
-            Chef::Log.debug("Loaded #{eip}")
 
             # The rest of this definition shows relevant information when -VV
             #   is passed to knife and aids in troubleshooting any refusal to

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

@@ -33,10 +33,7 @@ module Ironfan
         #
         def self.load!(cluster=nil)
           Ec2.elb.load_balancers.each do |raw|
-            next if raw.blank?
-            elb = ElasticLoadBalancer.new(:adaptee => raw)
-            remember(elb)
-            Chef::Log.debug("Loaded #{elb}: #{elb.inspect}")
+            register raw unless raw.blank?
           end
         end
 

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

@@ -31,7 +31,6 @@ module Ironfan
             iss = new(:adaptee => cert)
             remember(iss, { :id => cert['ServerCertificateName'] })
             remember(iss, { :id => "#{ARN_PREFIX}:#{cert['Arn']}" })
-            Chef::Log.debug("Loaded #{cert.inspect}")
           end
         end
 

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

@@ -37,7 +37,6 @@ module Ironfan
         def self.load!(cluster=nil)
           Ec2.connection.key_pairs.each do |keypair|
             register keypair unless keypair.blank?
-            Chef::Log.debug("Loaded <%-15s %s>" % [handle, keypair.name])
           end
         end
 

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

@@ -127,7 +127,6 @@ module Ironfan
             else # never seen it
               remember machine
             end
-            Chef::Log.debug("Loaded #{machine}")
           end
         end
 

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

@@ -19,7 +19,6 @@ module Ironfan
           result = Ec2.connection.describe_placement_groups
           result.body["placementGroupSet"].each do |group|
             register group unless group.blank?
-            Chef::Log.debug("Loaded #{group.inspect}")
           end
         end
       end

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

@@ -33,9 +33,7 @@ module Ironfan
         #
         def self.load!(cluster=nil)
           Ec2.connection.security_groups.reject { |raw| raw.blank? }.each do |raw|
-            sg = SecurityGroup.new(:adaptee => raw)
-            remember(sg)
-            Chef::Log.debug("Loaded #{sg}: #{sg.inspect}")
+            remember SecurityGroup.new(:adaptee => raw)
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 4.11.0
+  version: 4.11.1
   prerelease: 
 platform: ruby
 authors:
@@ -381,7 +381,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2459303337095261930
+      hash: 2795032387684139978
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: