aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-05 22:42:18 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-05 22:42:18 -0300
commitdd7c7af03377098faeec1cce1d4c712ec9112fc2 (patch)
tree2ac1f60542a7490789015b6268ef72e61042be16
parentd5818c8e2f0ce39cd95f119c278ceec76a1dc5a7 (diff)
downloadhydra-dd7c7af03377098faeec1cce1d4c712ec9112fc2.tar.gz
hydra-dd7c7af03377098faeec1cce1d4c712ec9112fc2.tar.bz2
Going masterless on jessie
-rw-r--r--lib/hydra/deploy2
-rwxr-xr-xshare/hydractl/system-upgrade8
2 files changed, 6 insertions, 4 deletions
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