diff --git a/devkit_proxmox.STDIN.stdin_or_jsons.to.jsons.sh b/devkit_proxmox.STDIN.stdin_or_jsons.to.jsons.sh index 2f28751..939037a 100755 --- a/devkit_proxmox.STDIN.stdin_or_jsons.to.jsons.sh +++ b/devkit_proxmox.STDIN.stdin_or_jsons.to.jsons.sh @@ -52,7 +52,10 @@ NEW_KEY_FIELD_NAME_FROM_STDIN=$(extract_new_key_field_name_from_stdin "$1") JSON_LINE_REQ=$( - { [ -t 0 ] && printf "%s\n" "$VAULT_NODE" || cat -; } | + { [ -t 0 ] && printf "%s +" "$VAULT_NODE" || { _STDIN=$(cat -); [ -n "$_STDIN" ] && printf "%s +" "$_STDIN" || printf "%s +" "$VAULT_NODE"; }; } | jq -R -c --arg key "$NEW_KEY_FIELD_NAME_FROM_STDIN" ' (fromjson? // .) as $v_to_evaluate | if ($v_to_evaluate | type) == "object" then diff --git a/proxmox__inc.jsons.basic_vm_actions.to.jsons.sh b/proxmox__inc.jsons.basic_vm_actions.to.jsons.sh index c6bc7b4..9fdb046 100755 --- a/proxmox__inc.jsons.basic_vm_actions.to.jsons.sh +++ b/proxmox__inc.jsons.basic_vm_actions.to.jsons.sh @@ -265,7 +265,9 @@ if [ ! -t 0 ]; then assign_if_not_empty "dest_proxmox_storage" "$line" ".dest_proxmox_storage" # ARG_ACTION=$(printf "%s\n" "$line" | jq -r ".action") - PROXMOX_NODE=$(printf "%s\n" "$line" | jq -r ".proxmox_node") + PROXMOX_NODE=$(printf "%s +" "$line" | jq -r ".proxmox_node") + ANSIBLE_HOST="${RANGE42_INFRASTRUCTURE_CODENAME:-$PROXMOX_NODE}" #### DEBUG purpose. @@ -282,7 +284,7 @@ if [ ! -t 0 ]; then ( ANSIBLE_CONFIG="$ANSIBLE_CONFIG" \ ansible-playbook -i "$INVENTORY" "${VAULT_ARGS[@]}" /dev/stdin <