From d0ca504c06495fc5bb2e9f30760c1b50870e24f4 Mon Sep 17 00:00:00 2001
From: Kevin Gallagher <kevin@z.cash>
Date: Thu, 8 Dec 2016 11:19:41 -0800
Subject: [PATCH] Fix unarchive task in Gitian role

As of Ansible 2.2.0, copy and remote_src are mutually exclusive.
Also adds IdentitiesOnly=yes to SSH options.
---
 ansible.cfg                 | 2 +-
 roles/gitian/tasks/main.yml | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ansible.cfg b/ansible.cfg
index 6551ea0..d9ad39d 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -6,6 +6,6 @@ host_key_checking = False
 timeout = 60
 
 [ssh_connection]
-ssh_args = -o ControlMaster=auto -o ControlPersist=300s -o ConnectTimeout=60
+ssh_args = -o ControlMaster=auto -o ControlPersist=300s -o ConnectTimeout=60 -o IdentitiesOnly=yes
 pipelining = True
 scp_if_ssh = True
diff --git a/roles/gitian/tasks/main.yml b/roles/gitian/tasks/main.yml
index 2430981..ed91dee 100644
--- a/roles/gitian/tasks/main.yml
+++ b/roles/gitian/tasks/main.yml
@@ -92,7 +92,6 @@
   unarchive:
     src: "{{ vm_builder_url }}"
     dest: "{{ download_directory }}"
-    copy: no
     remote_src: yes
 
 - name: Install VM builder Python module.