From cee76ee7b9a861e8d4cb6ae8819bcc3c956b2d8d Mon Sep 17 00:00:00 2001
From: David Wilson <dw@botanicus.net>
Date: Tue, 29 May 2018 00:45:11 +0100
Subject: [PATCH] tests: gcloud setup fixes.

---
 tests/ansible/gcloud/ansible.cfg    | 3 +++
 tests/ansible/gcloud/controller.yml | 9 +++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/ansible/gcloud/ansible.cfg b/tests/ansible/gcloud/ansible.cfg
index d1fcd982..75be745c 100644
--- a/tests/ansible/gcloud/ansible.cfg
+++ b/tests/ansible/gcloud/ansible.cfg
@@ -1,3 +1,6 @@
 [defaults]
+strategy_plugins = ../../../ansible_mitogen/plugins/strategy
+strategy = mitogen
 inventory = hosts
 retry_files_enabled = False
+host_key_checking = False
diff --git a/tests/ansible/gcloud/controller.yml b/tests/ansible/gcloud/controller.yml
index 4c768510..48f233d9 100644
--- a/tests/ansible/gcloud/controller.yml
+++ b/tests/ansible/gcloud/controller.yml
@@ -1,9 +1,6 @@
 
 - hosts: controller
   tasks:
-    - shell: "rsync -a ~/.ssh {{inventory_hostname}}:"
-      connection: local
-
     - lineinfile:
         line: "net.ipv4.ip_forward=1"
         path: /etc/sysctl.conf
@@ -30,6 +27,10 @@
       - libsasl2-dev
       - build-essential
       - git
+      - rsync
+
+    - shell: "rsync -a ~/.ssh {{inventory_hostname}}:"
+      connection: local
 
     - git:
         dest: ~/mitogen
@@ -39,7 +40,7 @@
     - git:
         dest: ~/ansible
         repo: https://github.com/dw/ansible.git
-        version: lazy-vars
+        version: dmw
 
     - pip:
         virtualenv: ~/venv