From 3622801ad4952001a911167f2e514533895a6e48 Mon Sep 17 00:00:00 2001 From: aperigault Date: Wed, 13 Sep 2017 13:44:41 +0200 Subject: [PATCH] Use ansible network env vars to authentication on fortigates (#29499) --- lib/ansible/module_utils/fortios.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/fortios.py b/lib/ansible/module_utils/fortios.py index 65deef5be5..1d69cbebb4 100644 --- a/lib/ansible/module_utils/fortios.py +++ b/lib/ansible/module_utils/fortios.py @@ -31,6 +31,7 @@ import time import traceback from ansible.module_utils._text import to_native +from ansible.module_utils.basic import env_fallback # check for pyFG lib @@ -45,8 +46,8 @@ fortios_argument_spec = dict( file_mode=dict(type='bool', default=False), config_file=dict(type='path'), host=dict(), - username=dict(), - password=dict(type='str', no_log=True), + username=dict(fallback=(env_fallback, ['ANSIBLE_NET_USERNAME'])), + password=dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True), timeout=dict(type='int', default=60), vdom=dict(type='str'), backup=dict(type='bool', default=False),