Merge branch 'reboot'

bewiwi · Jun 10, 2014 · 8fac1c6 · 8fac1c6
2 parents 0c9287b + 91f5dc6
commit 8fac1c6
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/lib/vagrant-openstack-plugin/action.rb b/lib/vagrant-openstack-plugin/action.rb
@@ -125,14 +125,12 @@ def self.action_reload
           b.use Call, IsPaused do |env, b1|
             unless env[:result]
               b1.use Call, IsSuspended do |env2, b2|
-                b1.use action_halt unless env2[:result]
+                b2.use RebootServer
               end
             end
 
-            b1.use Call, WaitForState, [:paused, :suspended], 120 do |env2, b2|
-              if env2[:result]
-                b2.use action_up
-              else
+            b1.use Call, WaitForState, [:active], 120 do |env2, b2|
+              unless env2[:result]
                 b2.use HardRebootServer
               end
             end