plugins/providers/virtualbox/action.rb in vagrant-unbundled-2.2.9.0 vs plugins/providers/virtualbox/action.rb in vagrant-unbundled-2.2.10.0

@@ -77,16 +77,26 @@
           b.use Network
           b.use NetworkFixIPv6
           b.use ForwardPorts
           b.use SetHostname
           b.use SaneDefaults
+          b.use Call, IsEnvSet, :cloud_init do |env, b2|
+            if env[:result]
+              b2.use CloudInitSetup
+            end
+          end
           b.use CleanupDisks
           b.use Disk
           b.use Customize, "pre-boot"
           b.use Boot
           b.use Customize, "post-boot"
           b.use WaitForCommunicator, [:starting, :running]
+          b.use Call, IsEnvSet, :cloud_init do |env, b2|
+            if env[:result]
+              b2.use CloudInitWait
+            end
+          end
           b.use Customize, "post-comm"
           b.use CheckGuestAdditions
         end
       end
 
@@ -104,11 +114,11 @@
             b2.use Call, DestroyConfirm do |env2, b3|
               if env2[:result]
                 b3.use ConfigValidate
                 b3.use ProvisionerCleanup, :before
                 b3.use CheckAccessible
-                b3.use EnvSet, force_halt: true
+                b3.use EnvSet, force_halt: env2[:force_halt]
                 b3.use action_halt
                 b3.use Destroy
                 b3.use CleanMachineFolder
                 b3.use DestroyUnusedNetworkInterfaces
                 b3.use PrepareNFSValidIds
@@ -409,9 +419,10 @@
               b2.use DiscardState
               b2.use MatchMACAddress
             end
           end
 
+          b.use EnvSet, cloud_init: true
           b.use action_start
         end
       end
     end
   end