Deploy: log support

diff --git a/doc/todo.rst b/doc/todo.rst
index 538592bbdd1205e85e677b16d2cd567b59a494f3..2215440eaa63e54535621717a02064d3128aad33 100644 (file)
--- a/doc/todo.rst
+++ b/doc/todo.rst
@@ -5,4 +5,3 @@ TODO
 - metrics and alarms subsystem.
 - deploy:
     - lockfile.
-    - log applied version and date (in the node and in the repo).

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 96dd67b1b03b936a550ab957d61f131444818525..cd46fadfbe4db5c40af3265e971b4357a194763e 100644 (file)
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -15,8 +15,8 @@ function hydra_deploy_setup {
   # Fix puppet folder permissions
   chmod 700 $HYDRA_FOLDER/puppet
 
-  # Ensure facts folder
-  mkdir -p $HYDRA_FOLDER/puppet/config/facts
+  # Ensure facts folder and logs foldes
+  mkdir -p $HYDRA_FOLDER/puppet/{config/facts,logs}
 
   if [ "$1" == "remote" ]; then
     # Deploy in a remote host

diff --git a/share/hydra/deploy b/share/hydra/deploy
index 38d8bcbb92b16f642445417ab0bdc51b6f554b04..3cec85f6f7280b9172bafb2adac0123bbacf1e61 100755 (executable)
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -73,7 +73,8 @@ for node in $NODES; do
 
     # Run puppet, overriding FQDN
     echo "Applying configuration..."
-    LC_ALL=C HOSTNAME=$FQDN FACTER_domain=$DOMAIN FACTER_hostname=$FQDN FACTER_fqdn=$HOSTNAME.$DOMAIN $DEPLOY_APPLY
+    LC_ALL=C HOSTNAME=$FQDN FACTER_domain=$DOMAIN FACTER_hostname=$FQDN FACTER_fqdn=$HOSTNAME.$DOMAIN $DEPLOY_APPLY 2>&1 | \
+      tee $HYDRA_FOLDER/puppet/logs/$FQDN.`date +%Y%M%d%H%M`.log
   elif [ "$node" == "localhost" ] || [ "$node" == "`facter fqdn`" ] || [ "$node" == "`facter hostname`" ]; then
     echo "Deploying to localhost..."
 
@@ -94,7 +95,8 @@ for node in $NODES; do
 
     # Run puppet
     echo "Applying configuration..."
-    $DEPLOY_APPLY
+    $DEPLOY_APPLY 2>&1 | \
+      tee $HYDRA_FOLDER/puppet/logs/$FQDN.`date +%Y%M%d%H%M`.log
   else
     echo "Deploying to $node..."
 
@@ -142,6 +144,7 @@ EOF
 
     # Run puppet
     echo "Applying configuration..."
-    $DEPLOY_APPLY
+    $DEPLOY_APPLY 2>&1 | \
+      tee $HYDRA_FOLDER/puppet/logs/$FQDN.`date +%Y%M%d%H%M`.log
   fi
 done