Upgrade: change order and purge more stuff

diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index c94216a6b302ce99e3ca0e60ede7f75ebdcc3a74..516063da98f56e50a53a0604e1e8d80b789697d3 100755 (executable)
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -124,13 +124,6 @@ function hydra_system_upgrade_upgrade {
     exit 1
   fi
 
-  hydra_system_upgrade_stage cleanup
-}
-
-# Cleanup procedures
-function hydra_system_upgrade_cleanup {
-  apt-get autoremove -y --purge
-  apt-get clean
   hydra_system_upgrade_stage custom
 }
 
@@ -138,11 +131,18 @@ function hydra_system_upgrade_cleanup {
 function hydra_system_upgrade_custom {
   # Custom jessie stuff
   if [ "$nextrelease" == "jessie" ]; then
-    # We're going masterless, so no puppet service
-    apt-get remove puppet
+    # We're going masterless, so no puppet and old services
+    apt-get purge puppet 'munin*' 'nagios*'
   fi
 
   hydractl trac-upgrade
+  hydra_system_upgrade_stage cleanup
+}
+
+# Cleanup procedures
+function hydra_system_upgrade_cleanup {
+  apt-get autoremove -y --purge
+  apt-get clean
   #hydra_system_upgrade_stage puppet
 }