diff options
| -rw-r--r-- | lib/hydra/deploy | 2 | ||||
| -rwxr-xr-x | share/hydractl/dist-upgrade | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/hydra/deploy b/lib/hydra/deploy index 713a53e..ed281d1 100644 --- a/lib/hydra/deploy +++ b/lib/hydra/deploy @@ -5,7 +5,7 @@ function hydra_deploy_setup { # Common parameters # Exclude eventual keys and version control files #DEPLOY_DEPENDENCIES="puppet-common ruby-sqlite3 ruby-activerecord ruby-activerecord-deprecated-finders augeas-tools" - DEPLOY_DEPENDENCIES="rsync puppet-common hiera-eyaml python3" + DEPLOY_DEPENDENCIES="rsync puppet hiera-eyaml python3" DEPLOY_RSYNC="rsync -CrltDvpq --no-owner --exclude=/ssl --exclude=keys --exclude=site_keys --exclude=config/secrets --delete --rsync-path" RSYNC_PATH="rsync -q" diff --git a/share/hydractl/dist-upgrade b/share/hydractl/dist-upgrade index 9ac3301..c59a1ae 100755 --- a/share/hydractl/dist-upgrade +++ b/share/hydractl/dist-upgrade @@ -165,8 +165,8 @@ function hydra_system_upgrade_custom { if [ "$nextrelease" == "jessie" ]; then # We're using a masterless puppet setup, so no agent - apt-get install puppet-common - apt-get purge puppet + apt-get install -y puppet-common + apt-get purge -y puppet # Purge old monitoring infrastructure apt-get purge 'munin*' 'nagios*' |