diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-20 14:51:02 -0300 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-20 14:51:02 -0300 |
commit | 41edaeba8733cd1b777bb5c4ccd5c81ef2a53a2e (patch) | |
tree | e8db1a57c2bb424b3008a30334675cff085c9aa5 /share/hydractl/system-upgrade | |
parent | 1c3054ae1923d6a748e300768d29cba8f9cdd6c2 (diff) | |
download | hydra-41edaeba8733cd1b777bb5c4ccd5c81ef2a53a2e.tar.gz hydra-41edaeba8733cd1b777bb5c4ccd5c81ef2a53a2e.tar.bz2 |
Removes puppet-enable and puppet-disable
Diffstat (limited to 'share/hydractl/system-upgrade')
-rwxr-xr-x | share/hydractl/system-upgrade | 15 |
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 |