Deploy: fix ENV

diff --git a/lib/hydra/deploy b/lib/hydra/deploy
index 56c52b834867693a74accffbe0eff7a6bfcf46cf..34137d6ff01b2aa10464a8b3cd85833b90da88c3 100644 (file)
--- 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

diff --git a/share/hydra/deploy b/share/hydra/deploy
index 91437ecbc6d8aa52a9fad2623b6e9b911a817a19..14aa17024c8914958df86c34efdec31106e874c2 100755 (executable)
--- a/share/hydra/deploy
+++ b/share/hydra/deploy
@@ -65,8 +65,7 @@ for node in $NODES; do
 
     # Run puppet, overriding FQDN
     echo "Applying configuration..."
-    echo HOSTNAME=$FQDN FACTER_domain=$DOMAIN FACTER_hostname=$FQDN FACTER_fqdn=$HOSTNAME.$DOMAIN $DEPLOY_APPLY
-    exit
+    LC_ALL=C HOSTNAME=$FQDN FACTER_domain=$DOMAIN FACTER_hostname=$FQDN FACTER_fqdn=$HOSTNAME.$DOMAIN $DEPLOY_APPLY
   elif [ "$node" == "localhost" ] || [ "$node" == "`facter fqdn`" ] || [ "$node" == "`facter hostname`" ]; then
     echo "Deploying to localhost..."