diff options
| -rw-r--r-- | docs/docsite/rst/network/user_guide/network_debug_troubleshooting.rst | 16 | ||||
| -rw-r--r-- | lib/ansible/config/base.yml | 2 | ||||
| -rw-r--r-- | lib/ansible/plugins/connection/netconf.py | 3 |
3 files changed, 10 insertions, 11 deletions
diff --git a/docs/docsite/rst/network/user_guide/network_debug_troubleshooting.rst b/docs/docsite/rst/network/user_guide/network_debug_troubleshooting.rst index 8bd1d21dd4..1938c0bfd3 100644 --- a/docs/docsite/rst/network/user_guide/network_debug_troubleshooting.rst +++ b/docs/docsite/rst/network/user_guide/network_debug_troubleshooting.rst @@ -627,14 +627,14 @@ Example ssh config file (~/.ssh/config) Example Ansible inventory file .. code-block:: ini - [junos] - junos - - [junos:vars] - ansible_connection=netconf - ansible_network_os=junos - ansible_user=myuser - ansible_ssh_pass=!vault... + [junos] + junos + + [junos:vars] + ansible_connection=netconf + ansible_network_os=junos + ansible_user=myuser + ansible_ssh_pass=!vault... .. note:: Using ``ProxyCommand`` with passwords via variables diff --git a/lib/ansible/config/base.yml b/lib/ansible/config/base.yml index d7b64e14e3..ca1a27ad46 100644 --- a/lib/ansible/config/base.yml +++ b/lib/ansible/config/base.yml @@ -1640,5 +1640,5 @@ NETCONF_SSH_CONFIG: ini: - {key: ssh_config, section: netconf_connection} yaml: {key: netconf_connection.ssh_config} - default: None + default: null ... diff --git a/lib/ansible/plugins/connection/netconf.py b/lib/ansible/plugins/connection/netconf.py index d886085c49..4358fdee97 100644 --- a/lib/ansible/plugins/connection/netconf.py +++ b/lib/ansible/plugins/connection/netconf.py @@ -153,7 +153,6 @@ options: env: - name: ANSIBLE_PERSISTENT_COMMAND_TIMEOUT netconf_ssh_config: - default: None description: - This variable is used to enable bastion/jump host with netconf connection. If set to True the bastion/jump host ssh settings should be present in ~/.ssh/config file, @@ -203,7 +202,7 @@ NETWORK_OS_DEVICE_PARAM_MAP = { "ce": "huawei" } -import q + class Connection(NetworkConnectionBase): """NetConf connections""" |