ssh_args = -o ControlMaster=auto -o ControlPersist=600s

alvistack · Feb 11, 2020 · 284ca05 · 284ca05
1 parent c6d093b
commit 284ca05
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: