diff --git a/lib/ansible/plugins/connection/netconf.py b/lib/ansible/plugins/connection/netconf.py index 0f87120aac6..95987fbff17 100644 --- a/lib/ansible/plugins/connection/netconf.py +++ b/lib/ansible/plugins/connection/netconf.py @@ -314,7 +314,7 @@ class Connection(NetworkConnectionBase): look_for_keys=self.get_option('look_for_keys'), device_params=device_params, allow_agent=self._play_context.allow_agent, - timeout=self._play_context.timeout, + timeout=self.get_option('persistent_connect_timeout'), ssh_config=ssh_config ) except SSHUnknownHostError as exc: diff --git a/lib/ansible/plugins/netconf/ce.py b/lib/ansible/plugins/netconf/ce.py index 1191811aba4..ef41b54994c 100644 --- a/lib/ansible/plugins/netconf/ce.py +++ b/lib/ansible/plugins/netconf/ce.py @@ -107,7 +107,7 @@ class Netconf(NetconfBase): hostkey_verify=obj.get_option('host_key_checking'), look_for_keys=obj.get_option('look_for_keys'), allow_agent=obj._play_context.allow_agent, - timeout=obj._play_context.timeout + timeout=obj.get_option('persistent_connect_timeout') ) except SSHUnknownHostError as exc: raise AnsibleConnectionFailure(to_native(exc)) diff --git a/lib/ansible/plugins/netconf/iosxr.py b/lib/ansible/plugins/netconf/iosxr.py index 8e641aa4a29..d80f0dbeeaf 100644 --- a/lib/ansible/plugins/netconf/iosxr.py +++ b/lib/ansible/plugins/netconf/iosxr.py @@ -109,7 +109,7 @@ class Netconf(NetconfBase): hostkey_verify=obj.get_option('host_key_checking'), look_for_keys=obj.get_option('look_for_keys'), allow_agent=obj._play_context.allow_agent, - timeout=obj._play_context.timeout + timeout=obj.get_option('persistent_connect_timeout') ) except SSHUnknownHostError as exc: raise AnsibleConnectionFailure(to_native(exc)) diff --git a/lib/ansible/plugins/netconf/junos.py b/lib/ansible/plugins/netconf/junos.py index f0b2a266d6d..55ca60fb995 100644 --- a/lib/ansible/plugins/netconf/junos.py +++ b/lib/ansible/plugins/netconf/junos.py @@ -117,7 +117,7 @@ class Netconf(NetconfBase): hostkey_verify=obj.get_option('host_key_checking'), look_for_keys=obj.get_option('look_for_keys'), allow_agent=obj._play_context.allow_agent, - timeout=obj._play_context.timeout + timeout=obj.get_option('persistent_connect_timeout') ) except SSHUnknownHostError as exc: raise AnsibleConnectionFailure(to_native(exc)) diff --git a/lib/ansible/plugins/netconf/sros.py b/lib/ansible/plugins/netconf/sros.py index 910b92e2d6e..c4504ca398c 100644 --- a/lib/ansible/plugins/netconf/sros.py +++ b/lib/ansible/plugins/netconf/sros.py @@ -86,7 +86,7 @@ class Netconf(NetconfBase): hostkey_verify=obj.get_option('host_key_checking'), look_for_keys=obj.get_option('look_for_keys'), allow_agent=obj._play_context.allow_agent, - timeout=obj._play_context.timeout + timeout=obj.get_option('persistent_connect_timeout') ) except SSHUnknownHostError as exc: raise AnsibleConnectionFailure(to_native(exc))