Handle Chef provisioner requests to reboot. A request to reboot is not a convergence failure, so don't treat it like a convergence failure.

Wait for the machine to reboot before trying to continue the provisioning.

plugins/provisioners/chef/provisioner/chef_client.rb

@@ -73,16 +73,22 @@ module VagrantPlugins
             @machine.ui.warn(I18n.t("vagrant.chef_run_list_empty"))
           end
 
-          if @machine.guest.capability?(:wait_for_reboot)
-            @machine.guest.capability(:wait_for_reboot)
-          end
-
           command = CommandBuilder.command(:client, @config,
             windows: windows?,
             colored: @machine.env.ui.color?,
           )
           
+          still_active = 259 #provisioner has asked chef to reboot 
+          
           @config.attempts.times do |attempt|
+            exit_status = 0
+            while exit_status == 0 || exit_status == still_active 
+              if @machine.guest.capability?(:wait_for_reboot)
+                @machine.guest.capability(:wait_for_reboot)
+              elsif attempt > 0
+                sleep 10
+                @machine.communicate.wait_for_ready(@machine.config.vm.boot_timeout)
+              end
               if attempt == 0
                 @machine.ui.info I18n.t("vagrant.provisioners.chef.running_client")
               else
@@ -103,6 +109,7 @@ module VagrantPlugins
               # There is no need to run Chef again if it converges
               return if exit_status == 0
             end
+          end
 
           # If we reached this point then Chef never converged! Error.
           raise ChefError, :no_convergence

plugins/provisioners/chef/provisioner/chef_solo.rb

@@ -176,17 +176,23 @@ module VagrantPlugins
             @machine.ui.warn(I18n.t("vagrant.chef_run_list_empty"))
           end
 
-          if @machine.guest.capability?(:wait_for_reboot)
-            @machine.guest.capability(:wait_for_reboot)
-          end
-
           command = CommandBuilder.command(:solo, @config,
             windows: windows?,
             colored: @machine.env.ui.color?,
             legacy_mode: @config.legacy_mode,
           )
 
+          still_active = 259 #provisioner has asked chef to reboot
+          
           @config.attempts.times do |attempt|
+            exit_status = 0
+            while exit_status == 0 || exit_status == still_active 
+              if @machine.guest.capability?(:wait_for_reboot)
+                @machine.guest.capability(:wait_for_reboot)
+              elsif attempt > 0
+                sleep 10
+                @machine.communicate.wait_for_ready(@machine.config.vm.boot_timeout)
+              end
               if attempt == 0
                 @machine.ui.info I18n.t("vagrant.provisioners.chef.running_solo")
               else
@@ -207,6 +213,7 @@ module VagrantPlugins
               # There is no need to run Chef again if it converges
               return if exit_status == 0
             end
+          end
 
           # If we reached this point then Chef never converged! Error.
           raise ChefError, :no_convergence

plugins/provisioners/chef/provisioner/chef_zero.rb

@@ -56,17 +56,23 @@ module VagrantPlugins
             @machine.ui.warn(I18n.t("vagrant.chef_run_list_empty"))
           end
 
-          if @machine.guest.capability?(:wait_for_reboot)
-            @machine.guest.capability(:wait_for_reboot)
-          end
-
           command = CommandBuilder.command(:client, @config,
             windows:    windows?,
             colored:    @machine.env.ui.color?,
             local_mode: true,
           )
 
+          still_active = 259 #provisioner has asked chef to reboot 
+          
           @config.attempts.times do |attempt|
+            exit_status = 0
+            while exit_status == 0 || exit_status == still_active 
+              if @machine.guest.capability?(:wait_for_reboot)
+                @machine.guest.capability(:wait_for_reboot)
+              elsif attempt > 0
+                sleep 10
+                @machine.communicate.wait_for_ready(@machine.config.vm.boot_timeout)
+              end
               if attempt == 0
                 @machine.ui.info I18n.t("vagrant.provisioners.chef.running_zero")
               else
@@ -87,6 +93,7 @@ module VagrantPlugins
               # There is no need to run Chef again if it converges
               return if exit_status == 0
             end
+          end
 
           # If we reached this point then Chef never converged! Error.
           raise ChefError, :no_convergence