aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2015-12-28 20:10:32 -0200
committerSilvio Rhatto <rhatto@riseup.net>2015-12-28 20:10:32 -0200
commit11a28d88f5b2b9935ba890347c9e15127924cf0b (patch)
treecde682caf34cf976f36e5e00de85fd522a569a93 /lib
parent78139f05356e09352356926a351c77f40470bae5 (diff)
downloadhydra-11a28d88f5b2b9935ba890347c9e15127924cf0b.tar.gz
hydra-11a28d88f5b2b9935ba890347c9e15127924cf0b.tar.bz2
Deploy: fix ENV
Diffstat (limited to 'lib')
-rw-r--r--lib/hydra/deploy4
1 files changed, 2 insertions, 2 deletions
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