zuul/zuul-jobs
Code Issues Proposed changes

add-build-sshkey: call cmd with command

Browse Source 
Currently a new cmd shell is opened instead of running the command
supplied when adding the build key for ssh enabled windows nodes.

Fix this by adding a '/c' flag.

Change-Id: I582febfe91d5dc229cc6a1959477a461a237336b
This commit is contained in:
Albin Vass
2020-08-11 11:40:29 +02:00
parent 4ab37d798a
commit 2e7b28ee86
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
roles/add-build-sshkey/tasks/remote-windows.yaml
View File

@@ -16,9 +16,9 @@
echo "Add build ssh keys to authorized_keys" echo "Add build ssh keys to authorized_keys"
{% if win_admin_ssh | default(false) %} {% if win_admin_ssh | default(false) %}
ssh -o BatchMode=yes {{ ansible_user }}@{{ ansible_host }} cmd "type .ssh\\id_rsa.pub >> %programdata%\\ssh\\administrators_authorized_keys" ssh -o BatchMode=yes {{ ansible_user }}@{{ ansible_host }} cmd /c "type .ssh\\id_rsa.pub >> %programdata%\\ssh\\administrators_authorized_keys"
{% else %} {% else %}
ssh -o BatchMode=yes {{ ansible_user }}@{{ ansible_host }} cmd "type .ssh\\id_rsa.pub >> .ssh\\authorized_keys" ssh -o BatchMode=yes {{ ansible_user }}@{{ ansible_host }} cmd /c "type .ssh\\id_rsa.pub >> .ssh\\authorized_keys"
{% endif %} {% endif %}
register: windows_remote_ssh register: windows_remote_ssh
# Ignore errors here because this should not break non-ssh enabled windows hosts # Ignore errors here because this should not break non-ssh enabled windows hosts