chef-workflow 0.2.3 → 0.2.4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+* 0.2.4 April 4, 2013
+  * Fixed situations where client bootstrap fails due to a bad recipe, and the
+    run_list isn't preserved, which meant to do further converges you would
+    need to edit the node manually.
 * 0.2.3 March 30, 2013
   * fix a bug where the automated security group generator would never actually find a collision
 * 0.2.2 March 12, 2013

data/lib/chef-workflow/support/vm/knife.rb

@@ -203,10 +203,20 @@ module ChefWorkflow
           # knife bootstrap is the honey badger when it comes to exit status.
           # We can't rely on it, so we examine the run_list of the node instead
           # to ensure it converged.
-          run_list_size = Chef::Node.load(node_name).run_list.to_a.size rescue 0
+          node = Chef::Node.load(node_name) rescue nil
+          run_list_size = node ? (node.run_list.to_a.size rescue 0) : 0
           unless run_list_size > 0
             puts bootstrap_cli.ui.stdout.string
             puts bootstrap_cli.ui.stderr.string
+
+            if node
+              #
+              # hack for bad first-converges that preserves the run list.
+              #
+              @run_list.each { |i| node.run_list.add(i) unless node.run_list.include?(i) }
+              node.save
+            end
+
             raise "bootstrap for #{node_name}/#{ip} wasn't successful."
           end
           if_debug(2) do

data/lib/chef-workflow/version.rb

@@ -1,4 +1,4 @@
 module ChefWorkflow
   # The gem version.
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-workflow
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant-prison
@@ -223,7 +223,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4084276637561648362
+      hash: 303264598946697222
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -232,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4084276637561648362
+      hash: 303264598946697222
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25