summaryrefslogtreecommitdiff
path: root/share/hydractl/system-upgrade
diff options
context:
space:
mode:
Diffstat (limited to 'share/hydractl/system-upgrade')
-rwxr-xr-xshare/hydractl/system-upgrade15
1 files changed, 5 insertions, 10 deletions
diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index 2ad06e6..b9a6b96 100755
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -81,8 +81,11 @@ function hydra_system_upgrade_env {
# Prepare the environment for a system upgrade
function hydra_system_upgrade_prepare {
# Ensure puppet is stopped during the process
- echo "Disabling puppet during the upgrade..."
- hydractl puppet-disable
+ if [ -e "/etc/default/puppet" ]; then
+ echo "Disabling puppet agent..."
+ sed -i -e 's/START=yes/START=no/' /etc/default/puppet
+ service puppet stop
+ fi
# Configure apt for the next debian release
echo ""
@@ -151,14 +154,6 @@ function hydra_system_upgrade_custom {
fi
hydractl trac-upgrade
- hydra_system_upgrade_stage puppet
-}
-
-# Enable puppet again
-function hydra_system_upgrade_puppet {
- echo ""
- echo "Starting puppet again..."
- hydractl puppet-enable
}
# Initialize