From 9f82b59de71def509f531c54496e20552c085c1b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 19 Oct 2015 15:07:43 -0200
Subject: Deploy: dependencies

---
 lib/hydra/deploy      | 1 +
 share/hydra/deploy    | 2 +-
 share/hydractl/deploy | 6 ++++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 5fecafd..05479fe 100644
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -4,6 +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_RSYNC="rsync -CrltDv --no-perms --exclude=ssl --exclude=keys --exclude=hiera/secrets --delete --rsync-path"
   RSYNC_PATH="rsync"
   COPY_PATH=""
diff --git a/share/hydra/deploy b/share/hydra/deploy
index d7d4d95..7943a7a 100755
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -48,7 +48,7 @@ for node in $NODES; do
   if ! which puppet &> /dev/null; then
     echo "Installing puppet..."
     sudo aptitude update
-    sudo aptitude install puppet -y
+    sudo aptitude install $DEPLOY_DEPENDENCIES
   fi
   ##### END REMOTE SCRIPT #######
 EOF
diff --git a/share/hydractl/deploy b/share/hydractl/deploy
index a500a6e..85745ca 100755
--- a/share/hydractl/deploy
+++ b/share/hydractl/deploy
@@ -39,7 +39,7 @@ if [ ! -z "$FOLDER" ]; then
 
   # Check if puppet is installed
   if [ ! -e "$FOLDER/usr/bin/puppet" ]; then
-    $DEPLOY_COMMAND apt-get install puppet -y
+    $DEPLOY_COMMAND apt-get install $DEPLOY_DEPENDENCIES -y
   fi
 
   # Run puppet, overriding FQDN
@@ -51,7 +51,9 @@ elif [ -e "$HYDRA_FOLDER/puppet/manifests/nodes/$FQDN.pp" ]; then
   hydra_deploy_setup
 
   # Check if puppet is installed
-  hydra_install_package puppet
+  for dep in $DEPLOY_DEPENDENCIES; do
+    hydra_install_package $dep
+  done
 
   # Run puppet
   $DEPLOY_APPLY
-- 
cgit v1.2.3