Newnode: fix hiera-yaml handling

diff --git a/share/hydra/newnode b/share/hydra/newnode
index 5e2a4695c64b60f5a7712a5358a85c142b429d7d..d087e5b52ae2644d0df38608f00a01e7538b3ffb 100755 (executable)
--- a/share/hydra/newnode
+++ b/share/hydra/newnode
@@ -91,14 +91,19 @@ echo "nodo::subsystem::backup::encryptkey: '$KEYID'" >> $HYDRA_FOLDER/puppet/con
 echo "" >> $HYDRA_FOLDER/puppet/config/secrets/node/$NODE.yaml
 
 # Add OpenPGP passphrase into secret node config
-keyringer $HYDRA decrypt nodes/$NODE/gpg/key.passwd | \
-hydra fluxo eyaml $NODE encrypt --stdin -o block -q -l nodo::subsystem::backup::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$NODE.yaml
+# We cannot simple pipe keyringer output into hiera-eyaml otherwiser the newline after the password will be interpreted as part of the password
+#keyringer $HYDRA decrypt nodes/$NODE/gpg/key.passwd | \
+#hydra fluxo eyaml $NODE encrypt --stdin -o block -q -l nodo::subsystem::backup::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$NODE.yaml
+PASSWORD="`keyringer $HYDRA decrypt nodes/$NODE/gpg/key.passwd`"
+echo -n "$PASSWORD" | hydra fluxo eyaml $NODE encrypt --stdin -o block -q -l nodo::subsystem::backup::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$NODE.yaml
 
 echo "" >> $HYDRA_FOLDER/puppet/config/secrets/node/$NODE.yaml
 
 # Add Borg passphrase into secret node config
-keyringer $HYDRA decrypt nodes/$NODE/borg/key.passwd | \
-hydra fluxo eyaml $NODE encrypt --stdin -o block -q -l nodo::subsystem::backup::borg::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$NODE.yaml
+#keyringer $HYDRA decrypt nodes/$NODE/borg/key.passwd | \
+#hydra fluxo eyaml $NODE encrypt --stdin -o block -q -l nodo::subsystem::backup::borg::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$NODE.yaml
+PASSWORD="`keyringer $HYDRA decrypt nodes/$NODE/borg/key.passwd`"
+echo -n "$PASSWORD" | hydra fluxo eyaml $NODE encrypt --stdin -o block -q -l nodo::subsystem::backup::borg::password >> $HYDRA_FOLDER/puppet/config/secrets/node/$NODE.yaml
 
 # Ansible config
 if [ -e "$HYDRA_FOLDER/ansible/inventories/production/hosts" ]; then