Cleanup system-upgrade

diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index 358920bd0ea53eeb113f765f0caf50cd6a266350..2ad06e68c5527a5e955f8180d915777c659fc525 100755 (executable)
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -29,10 +29,11 @@ ENV="$TMP/system-upgrade-env"
 BASENAME="`basename $0`"
 NEXTRELEASE="$1"
 
-# Record current state of the upgrade
+# Proceed to the next upgrade stage
 function hydra_system_upgrade_stage {
   STAGE="$1"
   echo $STAGE > $STATE
+  hydra_system_upgrade_$STAGE
 }
 
 # Set and check upgrade environment
@@ -154,7 +155,7 @@ function hydra_system_upgrade_custom {
 }
 
 # Enable puppet again
-function hydra_system_upgrade_custom {
+function hydra_system_upgrade_puppet {
   echo ""
   echo "Starting puppet again..."
   hydractl puppet-enable
@@ -170,38 +171,9 @@ else
   # Restore environment
   if [ -e "$ENV" ]; then
     source $ENV
-    hydra_system_upgrade_$STAGE
   fi
-fi
-
-# Prepare
-if [ "$STAGE" == "prepare" ]; then
-  hydra_system_upgrade_prepare
-fi
 
-# Download packages
-if [ "$STAGE" == "download" ]; then
-  hydra_system_upgrade_download
-fi
-
-# Upgrade the system
-if [ "$STAGE" == "upgrade" ]; then
-  hydra_system_upgrade_upgrade
-fi
-
-# Cleanup
-if [ "$STAGE" == "cleanup" ]; then
-  hydra_system_upgrade_cleanup
-fi
-
-# Custom procedures
-if [ "$STAGE" == "custom" ]; then
-  hydra_system_upgrade_custom
-fi
-
-# Enable puppet again
-if [ "$STAGE" == "puppet" ]; then
-  hydra_system_upgrade_puppet
+  hydra_system_upgrade_$STAGE
 fi
 
 # Teardown