diff options
author | Ganesh B. Nalawade <ganesh634@gmail.com> | 2018-07-04 11:37:35 +0530 |
---|---|---|
committer | Ganesh B. Nalawade <ganesh634@gmail.com> | 2018-07-04 11:37:35 +0530 |
commit | d1ff8e2dca1883963dfb33daaaf2001d018d6ce4 (patch) | |
tree | aab1779135c6b5d448237151cac9dcab1c050cc9 /lib/ansible/plugins/connection | |
parent | fa8b07e452ca64ebd5debe858737e9d1a671f0cd (diff) | |
download | ansible-d1ff8e2dca1883963dfb33daaaf2001d018d6ce4.tar.gz |
Update ssh_config to accept file path
Diffstat (limited to 'lib/ansible/plugins/connection')
-rw-r--r-- | lib/ansible/plugins/connection/netconf.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lib/ansible/plugins/connection/netconf.py b/lib/ansible/plugins/connection/netconf.py index 0db23ff0e7..d886085c49 100644 --- a/lib/ansible/plugins/connection/netconf.py +++ b/lib/ansible/plugins/connection/netconf.py @@ -153,11 +153,12 @@ options: env: - name: ANSIBLE_PERSISTENT_COMMAND_TIMEOUT netconf_ssh_config: - type: boolean - default: False + default: None description: - - This variable is used to enable bastion/jump host with netconf connection. The bastion/jump - host ssh settings should be present in ssh configuration file (~/.ssh/config). + - 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, + alternatively it can be set to custom ssh configuration file path to read the + bastion/jump host settings. ini: - section: netconf_connection key: ssh_config @@ -175,7 +176,7 @@ import json from ansible.errors import AnsibleConnectionFailure, AnsibleError from ansible.module_utils._text import to_bytes, to_native, to_text -from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE +from ansible.module_utils.parsing.convert_bool import BOOLEANS_TRUE, BOOLEANS_FALSE from ansible.plugins.loader import netconf_loader from ansible.plugins.connection import NetworkConnectionBase @@ -202,7 +203,7 @@ NETWORK_OS_DEVICE_PARAM_MAP = { "ce": "huawei" } - +import q class Connection(NetworkConnectionBase): """NetConf connections""" @@ -266,7 +267,7 @@ class Connection(NetworkConnectionBase): ssh_config = self.get_option('netconf_ssh_config') if ssh_config in BOOLEANS_TRUE: ssh_config = True - else: + elif ssh_config in BOOLEANS_FALSE: ssh_config = None try: |