Merge pull request #2038 from skazi0/restricted-crowbar-upgrade-reboot

upgrade: Allow transition from crowbar_upgrade to reboot (trivial)

Author: skazi0

crowbar_framework/lib/crowbar/state.rb

@@ -82,8 +82,8 @@ def valid_restricted_transition?(current, target)
           "recovering" => ["readying", "reboot", "shutdown", "problem"],
           "problem" => ["readying", "reboot", "shutdown"],
           ## other states that can be set by rails app
-          # upgrade is controlled by rails app
-          "crowbar_upgrade" => [],
+          # upgrade is entered by rails app but left by crowbar_join/reboot
+          "crowbar_upgrade" => ["reboot"],
           "confupdate" => ["hardware-updating"],
           "update" => ["hardware-updating"],
           # noupdate is when we have no up-to-date data from chef; in theory