From 757ec08ddb27914688699c4d89b7361ab0e15f3d Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 30 Jun 2017 17:32:36 -0700 Subject: [PATCH] Fix some errors with the replace-keys role The stat module requires a path argument. We want to use the -D argument to ssh-add which means 'delete all identities', not -d which means 'delete the default identities'. Change-Id: I04dc8d409ec0d315a055fed2615acb400310c866 --- roles/add-build-sshkey/tasks/create-key-and-replace.yaml | 2 +- roles/add-build-sshkey/tasks/main.yaml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/roles/add-build-sshkey/tasks/create-key-and-replace.yaml b/roles/add-build-sshkey/tasks/create-key-and-replace.yaml index 5ce52e3..87ddbbe 100644 --- a/roles/add-build-sshkey/tasks/create-key-and-replace.yaml +++ b/roles/add-build-sshkey/tasks/create-key-and-replace.yaml @@ -9,7 +9,7 @@ key: "{{ lookup('file', zuul_temp_ssh_key + '.pub') }}" - name: Remove all keys from local agent - command: ssh-add -d + command: ssh-add -D delegate_to: localhost - name: Add back temp key diff --git a/roles/add-build-sshkey/tasks/main.yaml b/roles/add-build-sshkey/tasks/main.yaml index dc5746b..3ffd791 100644 --- a/roles/add-build-sshkey/tasks/main.yaml +++ b/roles/add-build-sshkey/tasks/main.yaml @@ -1,5 +1,6 @@ - name: Check to see if ssh key was already created for this build - stat: "{{ zuul_temp_ssh_key }}" + stat: + path: "{{ zuul_temp_ssh_key }}" register: zuul_temp_ssh_key_stat delegate_to: localhost failed_when: false