From 0fe29f8eb1db1b624156d977356f27cf81171eba Mon Sep 17 00:00:00 2001 From: Luis Rueda Date: Thu, 23 Mar 2017 21:54:34 -0500 Subject: [PATCH] Update netconf_config.py (#22429) Fixes issue https://github.com/ansible/ansible/issues/22410 Fix trailing whitespace at the end of line 66 Fix version_added: "2.3" for allow_agent and look_for_keys --- .../modules/network/netconf/netconf_config.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/ansible/modules/network/netconf/netconf_config.py b/lib/ansible/modules/network/netconf/netconf_config.py index fd058386b2..5e071b3c69 100644 --- a/lib/ansible/modules/network/netconf/netconf_config.py +++ b/lib/ansible/modules/network/netconf/netconf_config.py @@ -53,6 +53,20 @@ options: - if false, the ssh host key of the device is not checked default: true required: false + look_for_keys: + description: + - if true, enables looking in the usual locations for ssh keys (e.g. ~/.ssh/id_*) + - if false, disables looking for ssh keys + default: true + required: false + version_added: "2.3" + allow_agent: + description: + - if true, enables querying SSH agent (if found) for keys + - if false, disables querying the SSH agent for ssh keys + default: true + required: false + version_added: "2.3" username: description: - the username to authenticate with @@ -165,6 +179,8 @@ def main(): host=dict(type='str', required=True), port=dict(type='int', default=830), hostkey_verify=dict(type='bool', default=True), + allow_agent=dict(type='bool', default=True), + look_for_keys=dict(type='bool', default=True), username=dict(type='str', required=True, no_log=True), password=dict(type='str', required=True, no_log=True), xml=dict(type='str', required=True), @@ -189,6 +205,8 @@ def main(): host=module.params['host'], port=module.params['port'], hostkey_verify=module.params['hostkey_verify'], + allow_agent=module.params['allow_agent'], + look_for_keys=module.params['look_for_keys'], username=module.params['username'], password=module.params['password'], )