Deploy: dependencies

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 5fecafdf86acf20d2af34dbe842332a08fa48edf..05479fe695c92afb64f08799eaa87a9e17c9ecb0 100644 (file)
--- 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 d7d4d952cadb4f5239d82530ea5f34ea9821bda1..7943a7a6d21dceb9a7304eb327e36a9ff45359ec 100755 (executable)
--- 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 a500a6ea1b0d20cfc036296935c44930fd2f0532..85745ca64d2a7bfdcda71f3a138c013aa2a0a6bd 100755 (executable)
--- 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