Fix connect_timeout config varaible in netconf connection (#51055)

*  Fetch connect_timeout value from get_options()
   instead of play_context
pull/52220/head
Ganesh Nalawade 6 years ago committed by GitHub
parent 1b6228fa10
commit f547c88ade
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -314,7 +314,7 @@ class Connection(NetworkConnectionBase):
look_for_keys=self.get_option('look_for_keys'), look_for_keys=self.get_option('look_for_keys'),
device_params=device_params, device_params=device_params,
allow_agent=self._play_context.allow_agent, allow_agent=self._play_context.allow_agent,
timeout=self._play_context.timeout, timeout=self.get_option('persistent_connect_timeout'),
ssh_config=ssh_config ssh_config=ssh_config
) )
except SSHUnknownHostError as exc: except SSHUnknownHostError as exc:

@ -107,7 +107,7 @@ class Netconf(NetconfBase):
hostkey_verify=obj.get_option('host_key_checking'), hostkey_verify=obj.get_option('host_key_checking'),
look_for_keys=obj.get_option('look_for_keys'), look_for_keys=obj.get_option('look_for_keys'),
allow_agent=obj._play_context.allow_agent, allow_agent=obj._play_context.allow_agent,
timeout=obj._play_context.timeout timeout=obj.get_option('persistent_connect_timeout')
) )
except SSHUnknownHostError as exc: except SSHUnknownHostError as exc:
raise AnsibleConnectionFailure(to_native(exc)) raise AnsibleConnectionFailure(to_native(exc))

@ -109,7 +109,7 @@ class Netconf(NetconfBase):
hostkey_verify=obj.get_option('host_key_checking'), hostkey_verify=obj.get_option('host_key_checking'),
look_for_keys=obj.get_option('look_for_keys'), look_for_keys=obj.get_option('look_for_keys'),
allow_agent=obj._play_context.allow_agent, allow_agent=obj._play_context.allow_agent,
timeout=obj._play_context.timeout timeout=obj.get_option('persistent_connect_timeout')
) )
except SSHUnknownHostError as exc: except SSHUnknownHostError as exc:
raise AnsibleConnectionFailure(to_native(exc)) raise AnsibleConnectionFailure(to_native(exc))

@ -117,7 +117,7 @@ class Netconf(NetconfBase):
hostkey_verify=obj.get_option('host_key_checking'), hostkey_verify=obj.get_option('host_key_checking'),
look_for_keys=obj.get_option('look_for_keys'), look_for_keys=obj.get_option('look_for_keys'),
allow_agent=obj._play_context.allow_agent, allow_agent=obj._play_context.allow_agent,
timeout=obj._play_context.timeout timeout=obj.get_option('persistent_connect_timeout')
) )
except SSHUnknownHostError as exc: except SSHUnknownHostError as exc:
raise AnsibleConnectionFailure(to_native(exc)) raise AnsibleConnectionFailure(to_native(exc))

@ -86,7 +86,7 @@ class Netconf(NetconfBase):
hostkey_verify=obj.get_option('host_key_checking'), hostkey_verify=obj.get_option('host_key_checking'),
look_for_keys=obj.get_option('look_for_keys'), look_for_keys=obj.get_option('look_for_keys'),
allow_agent=obj._play_context.allow_agent, allow_agent=obj._play_context.allow_agent,
timeout=obj._play_context.timeout timeout=obj.get_option('persistent_connect_timeout')
) )
except SSHUnknownHostError as exc: except SSHUnknownHostError as exc:
raise AnsibleConnectionFailure(to_native(exc)) raise AnsibleConnectionFailure(to_native(exc))

Loading…
Cancel
Save