From 11a28d88f5b2b9935ba890347c9e15127924cf0b Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 28 Dec 2015 20:10:32 -0200
Subject: Deploy: fix ENV

---
 lib/hydra/deploy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 56c52b8..34137d6 100644
--- a/lib/hydra/deploy
+++ b/lib/hydra/deploy
@@ -18,6 +18,7 @@ function hydra_deploy_setup {
       DEPLOY_OPTS="$HYDRA_FOLDER/puppet/ $NODE:/etc/puppet/"
       DEPLOY_DEST="$FQDN:"
       RSYNC_PATH="sudo rsync -q"
+      REMOTE_ENV="LC_ALL=C"
       hydra_deploy_set_manifest
     else
       echo "No folder specified."
@@ -62,13 +63,12 @@ function hydra_deploy_setup {
   DOMAIN="`echo $FQDN | cut -d . -f 2-`"
   ROLE="`hydra_yaml_param nodo::role $HYDRA_FOLDER/puppet/hiera/node/$FQDN.yaml`"
   LOCATION="`hydra_yaml_param nodo::location $HYDRA_FOLDER/puppet/hiera/node/$FQDN.yaml`"
-  ENV="LC_ALL=C"
 
   # Puppet command
   if [ -e "$HYDRA_FOLDER/puppet/bin/deploy" ]; then
     DEPLOY_PUPPET="$DEPLOY_BASE/puppet/bin/deploy"
   else
-    DEPLOY_PUPPET="$ENV puppet apply $PUPPET_OPTS $PUPPET_MANIFEST"
+    DEPLOY_PUPPET="$REMOTE_ENV puppet apply $PUPPET_OPTS $PUPPET_MANIFEST"
   fi
 
   # Deployment command
-- 
cgit v1.2.3