From 6c5ea685a2425f34b71af674ee13df48d0ba148e Mon Sep 17 00:00:00 2001
From: Patrick Ogenstad <patrick@ogenstad.com>
Date: Thu, 14 Apr 2016 15:35:07 +0200
Subject: [PATCH] Allow timeout to be configurable (#14973)

---
 lib/ansible/module_utils/ios.py                | 7 ++++---
 lib/ansible/module_utils/shell.py              | 3 +--
 lib/ansible/utils/module_docs_fragments/ios.py | 6 ++++++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/lib/ansible/module_utils/ios.py b/lib/ansible/module_utils/ios.py
index 7c97f4c255..f467b7cf51 100644
--- a/lib/ansible/module_utils/ios.py
+++ b/lib/ansible/module_utils/ios.py
@@ -33,7 +33,8 @@ NET_COMMON_ARGS = dict(
     ssh_keyfile=dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
     authorize=dict(default=False, fallback=(env_fallback, ['ANSIBLE_NET_AUTHORIZE']), type='bool'),
     auth_pass=dict(no_log=True, fallback=(env_fallback, ['ANSIBLE_NET_AUTH_PASS'])),
-    provider=dict()
+    provider=dict(),
+    timeout=dict(default=10, type='int')
 )
 
 CLI_PROMPTS_RE = [
@@ -74,11 +75,12 @@ class Cli(object):
         username = self.module.params['username']
         password = self.module.params['password']
         key_filename = self.module.params['ssh_keyfile']
+        timeout = self.module.params['timeout']
 
         try:
             self.shell = Shell(kickstart=False, prompts_re=CLI_PROMPTS_RE,
                     errors_re=CLI_ERRORS_RE)
-            self.shell.open(host, port=port, username=username, password=password, key_filename=key_filename)
+            self.shell.open(host, port=port, username=username, password=password, key_filename=key_filename, timeout=timeout)
         except Exception, exc:
             msg = 'failed to connect to %s:%s - %s' % (host, port, str(exc))
             self.module.fail_json(msg=msg)
@@ -175,4 +177,3 @@ def get_module(**kwargs):
         module.fail_json(msg='paramiko is required but does not appear to be installed')
 
     return module
-
diff --git a/lib/ansible/module_utils/shell.py b/lib/ansible/module_utils/shell.py
index 90100fece4..a01b41b0c5 100644
--- a/lib/ansible/module_utils/shell.py
+++ b/lib/ansible/module_utils/shell.py
@@ -106,7 +106,7 @@ class Shell(object):
                     key_filename=key_filename, allow_agent=allow_agent)
 
         self.shell = self.ssh.invoke_shell()
-        self.shell.settimeout(10)
+        self.shell.settimeout(timeout)
 
         if self.kickstart:
             self.shell.sendall("\n")
@@ -184,4 +184,3 @@ class Shell(object):
             if match:
                 self._matched_prompt = match.group()
                 return True
-
diff --git a/lib/ansible/utils/module_docs_fragments/ios.py b/lib/ansible/utils/module_docs_fragments/ios.py
index fe354b1f94..514e9d1ab1 100644
--- a/lib/ansible/utils/module_docs_fragments/ios.py
+++ b/lib/ansible/utils/module_docs_fragments/ios.py
@@ -76,6 +76,12 @@ options:
         environment variable ANSIBLE_NET_AUTH_PASS will be used instead.
     required: false
     default: none
+  timeout:
+    description:
+      - Specifies idle timeout for the connection. Useful if the console
+        freezes before continuing. For example when saving configurations.
+    required: false
+    default: 10
   provider:
     description:
       - Convience method that allows all M(ios) arguments to be passed as