From 284ca0543c624a865e1fae69be2d4e50a4d21f79 Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@gmail.com>
Date: Tue, 11 Feb 2020 20:54:02 +0800
Subject: [PATCH] ssh_args = -o ControlMaster=auto -o ControlPersist=600s

---
 ansible.cfg                        | 3 ++-
 molecule/centos-7/molecule.yml     | 7 ++++++-
 molecule/redhat-7/molecule.yml     | 7 ++++++-
 molecule/suse-15/molecule.yml      | 7 ++++++-
 molecule/ubuntu-16.04/molecule.yml | 7 ++++++-
 molecule/ubuntu-18.04/molecule.yml | 7 ++++++-
 6 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/ansible.cfg b/ansible.cfg
index c26bdc9..882818d 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -2,11 +2,12 @@
 control_path = %(directory)s/%%h-%%p-%%r
 pipelining = true
 scp_if_ssh = true
+ssh_args = -o ControlMaster=auto -o ControlPersist=600s
 
 [defaults]
 ansible_managed = Ansible managed: Do NOT edit this file manually!
 display_failed_stderr = true
-forks = 10
+forks = 20
 host_key_checking = false
 interpreter_python = auto
 nocows = 1
diff --git a/molecule/centos-7/molecule.yml b/molecule/centos-7/molecule.yml
index a02e636..cc04b4c 100644
--- a/molecule/centos-7/molecule.yml
+++ b/molecule/centos-7/molecule.yml
@@ -28,7 +28,6 @@ platforms:
         network_name: private_network
         type: dhcp
     provider_raw_config_args:
-      - 'cpu_mode = "host-passthrough"'
       - 'nic_model_type = "virtio"'
       - 'disk_bus = "virtio"'
       - 'volume_cache = "none"'
@@ -45,6 +44,12 @@ provisioner:
   name: ansible
   env:
     ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
+  config_options:
+    defaults:
+      forks: 20
+    ssh_connection:
+      pipelining: true
+      ssh_args: -o ControlMaster=auto -o ControlPersist=600s
   lint:
     name: ansible-lint
   inventory:
diff --git a/molecule/redhat-7/molecule.yml b/molecule/redhat-7/molecule.yml
index 5e6bde2..8b98336 100644
--- a/molecule/redhat-7/molecule.yml
+++ b/molecule/redhat-7/molecule.yml
@@ -28,7 +28,6 @@ platforms:
         network_name: private_network
         type: dhcp
     provider_raw_config_args:
-      - 'cpu_mode = "host-passthrough"'
       - 'nic_model_type = "virtio"'
       - 'disk_bus = "virtio"'
       - 'volume_cache = "none"'
@@ -45,6 +44,12 @@ provisioner:
   name: ansible
   env:
     ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
+  config_options:
+    defaults:
+      forks: 20
+    ssh_connection:
+      pipelining: true
+      ssh_args: -o ControlMaster=auto -o ControlPersist=600s
   lint:
     name: ansible-lint
   inventory:
diff --git a/molecule/suse-15/molecule.yml b/molecule/suse-15/molecule.yml
index 10a8d5e..0a3c3b7 100644
--- a/molecule/suse-15/molecule.yml
+++ b/molecule/suse-15/molecule.yml
@@ -28,7 +28,6 @@ platforms:
         network_name: private_network
         type: dhcp
     provider_raw_config_args:
-      - 'cpu_mode = "host-passthrough"'
       - 'nic_model_type = "virtio"'
       - 'disk_bus = "sata"'
       - 'volume_cache = "none"'
@@ -45,6 +44,12 @@ provisioner:
   name: ansible
   env:
     ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
+  config_options:
+    defaults:
+      forks: 20
+    ssh_connection:
+      pipelining: true
+      ssh_args: -o ControlMaster=auto -o ControlPersist=600s
   lint:
     name: ansible-lint
   inventory:
diff --git a/molecule/ubuntu-16.04/molecule.yml b/molecule/ubuntu-16.04/molecule.yml
index 56327e1..683c5b4 100644
--- a/molecule/ubuntu-16.04/molecule.yml
+++ b/molecule/ubuntu-16.04/molecule.yml
@@ -28,7 +28,6 @@ platforms:
         network_name: private_network
         type: dhcp
     provider_raw_config_args:
-      - 'cpu_mode = "host-passthrough"'
       - 'nic_model_type = "virtio"'
       - 'disk_bus = "virtio"'
       - 'volume_cache = "none"'
@@ -45,6 +44,12 @@ provisioner:
   name: ansible
   env:
     ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
+  config_options:
+    defaults:
+      forks: 20
+    ssh_connection:
+      pipelining: true
+      ssh_args: -o ControlMaster=auto -o ControlPersist=600s
   lint:
     name: ansible-lint
   inventory:
diff --git a/molecule/ubuntu-18.04/molecule.yml b/molecule/ubuntu-18.04/molecule.yml
index 3aca533..f6b0ec0 100644
--- a/molecule/ubuntu-18.04/molecule.yml
+++ b/molecule/ubuntu-18.04/molecule.yml
@@ -28,7 +28,6 @@ platforms:
         network_name: private_network
         type: dhcp
     provider_raw_config_args:
-      - 'cpu_mode = "host-passthrough"'
       - 'nic_model_type = "virtio"'
       - 'disk_bus = "virtio"'
       - 'volume_cache = "none"'
@@ -45,6 +44,12 @@ provisioner:
   name: ansible
   env:
     ANSIBLE_ROLES_PATH: ${ANSIBLE_ROLES_PATH}
+  config_options:
+    defaults:
+      forks: 20
+    ssh_connection:
+      pipelining: true
+      ssh_args: -o ControlMaster=auto -o ControlPersist=600s
   lint:
     name: ansible-lint
   inventory: