Fix copy of node hiera secrets

diff --git a/lib/hydra/config b/lib/hydra/config
index d1eb411af01099c8c33474ee0ba4b84ce51bab26..07ade8d0800aad5a6e82ccc81c686aa5b3384896 100644 (file)
--- 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 4571c24278512fbbac878b115d8f524fae9b9cbe..47dbe625fa646dd26d203ddab0c0d35b2e4f88e3 100644 (file)
--- 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
 }