summaryrefslogtreecommitdiff
path: root/lib/ansible
diff options
context:
space:
mode:
authorGanesh B. Nalawade <ganesh634@gmail.com>2018-07-04 11:54:28 +0530
committerGanesh B. Nalawade <ganesh634@gmail.com>2018-07-04 17:45:12 +0530
commitc43beef258c9a95b4dc3bc3eaadd6c457dfe2866 (patch)
tree9bc756c18bd5ebd2d30508c010f2bba23924fccb /lib/ansible
parentd1ff8e2dca1883963dfb33daaaf2001d018d6ce4 (diff)
downloadansible-c43beef258c9a95b4dc3bc3eaadd6c457dfe2866.tar.gz
Minor changes
Diffstat (limited to 'lib/ansible')
-rw-r--r--lib/ansible/config/base.yml2
-rw-r--r--lib/ansible/plugins/connection/netconf.py3
2 files changed, 2 insertions, 3 deletions
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"""