Fix: switch puppet-common dependency

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 713a53e2a664634c8ed2ee3db8d21149c579a04d..ed281d1147e3202904c50daeb6260beb6852210c 100644 (file)
--- 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 9ac3301f1f9649267bb395d30a45c8f7f73afe3a..c59a1ae927cec55fc0ce8c4e8530981e483b26eb 100755 (executable)
--- 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*'