kitchen_hooks 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c55fcb4b71fbb2010f6d46b256f2d84b4953dd9c
-  data.tar.gz: 3efdac0901f9b235e3c237dff23e52e99fae879f
+  metadata.gz: 84bd322214efaab6ddc88bcb12f71a260dde5575
+  data.tar.gz: 4bba666a3c2433e12be6f14fcd9a9133445e3f1d
 SHA512:
-  metadata.gz: 6648b4f9e50981912b9d0199bf09d45ec9d970b125131832a0534dda5c70c8e5e5d002f13c5459adf4d0f3e966e6a933641f8d7f8b73018419fcf142217fc7fe
-  data.tar.gz: 9186ae05a8d2d515b3a6ba1a1e89268bbdd3650507fa736ef0b6968c5aab3c00f3a75529974cefd2adfe95c6c351fdf501ff5ba40605d9bb777ec826bdd46235
+  metadata.gz: a68e549efa7751edaa04d6871fcbf46daa3146c0c5e7baea2bbf289311f6fcc0abaa65781bce617cd6f006ae66a31e66bee1a74bf989d0544e4a91f1c0c4179f
+  data.tar.gz: 15d46641f5e1d183fe5cda5532c9c88ad0fc2fc257f78140b2174d5af61a312d1a423f5278aec9af53d5a8da99473759c3d9d66e734e4a5bcfb6f635318364ed

data/VERSION

@@ -1 +1 @@
-1.7.1
+1.7.2

data/etc/config.json

@@ -2,6 +2,7 @@
   "hipchat": null,
   "knives": {
     "bng11": "~/.chef/bng11.rb",
+    "bng": "~/.chef/bng.rb",
     "dc1": "~/.chef/dc1.rb"
   }
 }

data/lib/kitchen_hooks/helpers/sync_servers.rb

@@ -15,6 +15,7 @@ class SyncServers
   end
 
 
+
 private
 
   def ridleys
@@ -23,21 +24,37 @@ private
     end
   end
 
+
   def all_nodes
     @clients ||= {}
-    @all_nodes ||= ridleys.flat_map do |ridley|
+    bad_ridleys = []
+
+    @all_nodes ||= ridleys.each_with_index.pmap(4) do |ridley, i|
       clients = ridley.client.all
-      nodes = ridley.partial_search(:node, '*:*', %w[ ohai_time ])
 
-      nodes.each do |n|
+      begin
+        nodes = ridley.partial_search(:node, '*:*', %w[ ohai_time ])
+      rescue
+        puts 'WARNING: No partial search, skipping knife'
+        bad_ridleys << i
+        nodes = []
+      end
+
+      nodes.map do |n|
         c = clients.select { |c| c.name == n.name }.shift
         @clients[n.name] = c unless c.nil?
+        n
       end
+    end.flatten
 
-      nodes
+    bad_ridleys.sort.reverse.each do |idx|
+      @ridleys.delete_at idx
     end
+
+    return @all_nodes
   end
 
+
   def merged_nodes
     @merged_nodes ||= all_nodes.group_by(&:name).pmap do |_, copies|
       copies.sort_by { |c| c.automatic.ohai_time }.last
@@ -49,7 +66,7 @@ private
     nodes = merged_nodes
     failures = Set.new
 
-    nodes.peach(16) do |n|
+    nodes.peach(8) do |n|
       n.reload
 
       ridleys.peach(4) do |ridley|
@@ -65,8 +82,9 @@ private
       end
 
       puts 'Synced node "%s"' % n.name
-    end
+    end unless @ridleys.length == 1
 
+    puts 'Sync completed'
     return {
       failures: failures,
       num_successes: nodes.length - failures.length,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen_hooks
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Sean Clemmer