diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2015-10-19 15:35:14 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2015-10-19 15:35:14 -0200 |
| commit | 9f1a6723e37a9e82574cbd4a1a7f4726be9baf64 (patch) | |
| tree | e49ad373ed2d42b3ded5164ac938acc07d77d952 | |
| parent | 7486b9636e84391f1c83e82399681054d178e2a0 (diff) | |
| download | hydra-9f1a6723e37a9e82574cbd4a1a7f4726be9baf64.tar.gz hydra-9f1a6723e37a9e82574cbd4a1a7f4726be9baf64.tar.bz2 | |
Fix copy of node hiera secrets
| -rw-r--r-- | lib/hydra/config | 2 | ||||
| -rw-r--r-- | lib/hydra/deploy | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/hydra/config b/lib/hydra/config index d1eb411..07ade8d 100644 --- a/lib/hydra/config +++ b/lib/hydra/config @@ -52,7 +52,7 @@ function hydra_check_preferences { PUPPET="$HYDRA_FOLDER/puppet" PUPPET_KEYS="$PUPPET/keys" - export HYDRA_CONNECT="ssh -T -o ConnectTimeout=15" + export HYDRA_CONNECT="ssh -T -o -q ConnectTimeout=15" } # Load a parameter from config diff --git a/lib/hydra/deploy b/lib/hydra/deploy index 4571c24..47dbe62 100644 --- a/lib/hydra/deploy +++ b/lib/hydra/deploy @@ -107,8 +107,8 @@ function hydra_deploy_copy_secrets { hydra_deploy_copy $location $HYDRA_FOLDER/puppet/hiera/secrets/role/$ROLE.yaml $DEPLOY_DEST/etc/puppet/hiera/secrets/role/ fi - if [ ! -z "$NODE" ] && [ -e "$HYDRA_FOLDER/puppet/hiera/secrets/node/$NODE.yaml" ]; then - hydra_deploy_copy $location $HYDRA_FOLDER/puppet/hiera/secrets/node/$NODE.yaml $DEPLOY_DEST/etc/puppet/hiera/secrets/node/ + if [ ! -z "$FQDN" ] && [ -e "$HYDRA_FOLDER/puppet/hiera/secrets/node/$FQDN.yaml" ]; then + hydra_deploy_copy $location $HYDRA_FOLDER/puppet/hiera/secrets/node/$FQDN.yaml $DEPLOY_DEST/etc/puppet/hiera/secrets/node/ fi } |