diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-12-28 20:10:32 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-12-28 20:10:32 -0200 |
| commit | 11a28d88f5b2b9935ba890347c9e15127924cf0b (patch) | |
| tree | cde682caf34cf976f36e5e00de85fd522a569a93 | |
| parent | 78139f05356e09352356926a351c77f40470bae5 (diff) | |
| download | hydra-11a28d88f5b2b9935ba890347c9e15127924cf0b.tar.gz hydra-11a28d88f5b2b9935ba890347c9e15127924cf0b.tar.bz2 | |
Deploy: fix ENV
| -rw-r--r-- | lib/hydra/deploy | 4 | ||||
| -rwxr-xr-x | share/hydra/deploy | 3 |
2 files changed, 3 insertions, 4 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 diff --git a/share/hydra/deploy b/share/hydra/deploy index 91437ec..14aa170 100755 --- 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..." |