From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 6 Mar 2016 01:42:18 +0000 (-0300)
Subject: Going masterless on jessie
X-Git-Tag: 0.2.4~219
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=dd7c7af03377098faeec1cce1d4c712ec9112fc2;p=hydra.git

Going masterless on jessie
---

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 34137d6..cce2305 100644
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -4,7 +4,7 @@
 function hydra_deploy_setup {
   # Common parameters
   # Exclude eventual keys and version control files
-  DEPLOY_DEPENDENCIES="puppet ruby-sqlite3 ruby-activerecord ruby-activerecord-deprecated-finders"
+  DEPLOY_DEPENDENCIES="puppet-common ruby-sqlite3 ruby-activerecord ruby-activerecord-deprecated-finders"
   DEPLOY_RSYNC="rsync -CrltDvpq --no-owner --exclude=/ssl --exclude=keys --exclude=site_keys --exclude=hiera/secrets --delete --rsync-path"
   RSYNC_PATH="rsync -q"
 
diff --git a/share/hydractl/system-upgrade b/share/hydractl/system-upgrade
index 05f4bc5..c94216a 100755
--- a/share/hydractl/system-upgrade
+++ b/share/hydractl/system-upgrade
@@ -136,9 +136,11 @@ function hydra_system_upgrade_cleanup {
 
 # Custom upgrade procedures
 function hydra_system_upgrade_custom {
-  #if [ "$nextrelease" == "jessie" ]; then
-  #  # Do your custom jessie stuff here
-  #fi
+  # Custom jessie stuff
+  if [ "$nextrelease" == "jessie" ]; then
+    # We're going masterless, so no puppet service
+    apt-get remove puppet
+  fi
 
   hydractl trac-upgrade
   #hydra_system_upgrade_stage puppet