a-c-m
/
community.general
mirror of https://github.com/ansible-collections/community.general.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor changes

pull/4420/head
Ganesh B. Nalawade 2018-07-04 11:54:28 +05:30
parent d1ff8e2dca
commit c43beef258
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/docsite/rst/network/user_guide/network_debug_troubleshooting.rst
View File

@ -627,14 +627,14 @@ Example ssh config file (~/.ssh/config)
Example Ansible inventory file Example Ansible inventory file
.. code-block:: ini .. code-block:: ini
[junos] [junos]
junos junos
[junos:vars] [junos:vars]
ansible_connection=netconf ansible_connection=netconf
ansible_network_os=junos ansible_network_os=junos
ansible_user=myuser ansible_user=myuser
ansible_ssh_pass=!vault... ansible_ssh_pass=!vault...
.. note:: Using ``ProxyCommand`` with passwords via variables .. note:: Using ``ProxyCommand`` with passwords via variables

2
lib/ansible/config/base.yml
View File

@ -1640,5 +1640,5 @@ NETCONF_SSH_CONFIG:
ini: ini:
- {key: ssh_config, section: netconf_connection} - {key: ssh_config, section: netconf_connection}
yaml: {key: netconf_connection.ssh_config} yaml: {key: netconf_connection.ssh_config}
default: None default: null
... ...

3
lib/ansible/plugins/connection/netconf.py
View File

@ -153,7 +153,6 @@ options:
env: env:
- name: ANSIBLE_PERSISTENT_COMMAND_TIMEOUT - name: ANSIBLE_PERSISTENT_COMMAND_TIMEOUT
netconf_ssh_config: netconf_ssh_config:
default: None
description: description:
- This variable is used to enable bastion/jump host with netconf connection. If set to - 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, 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" "ce": "huawei"
} }
import q
class Connection(NetworkConnectionBase): class Connection(NetworkConnectionBase):
"""NetConf connections""" """NetConf connections"""