From 00cc7c03fa42b3f860b39687fd0d3aeb5da2c270 Mon Sep 17 00:00:00 2001 From: Peter Sprygada Date: Thu, 6 Oct 2016 16:42:00 -0400 Subject: [PATCH] Revert "update mask_passwords argument to be more descriptive in asa_config (#3109)" (#3110) This reverts commit 271e300745b7200fc57383916d87efd6640d093e. --- .../modules/extras/network/asa/asa_config.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/ansible/modules/extras/network/asa/asa_config.py b/lib/ansible/modules/extras/network/asa/asa_config.py index 4cd8b58635..320255b46f 100644 --- a/lib/ansible/modules/extras/network/asa/asa_config.py +++ b/lib/ansible/modules/extras/network/asa/asa_config.py @@ -146,14 +146,14 @@ options: required: false default: no choices: ['yes', 'no'] - mask_passwords: + passwords: description: - This argument specifies to include passwords in the config when retrieving the running-config from the remote device. This includes passwords related to VPN endpoints. This argument is mutually exclusive with I(defaults). - required: true - default: true + required: false + default: no choices: ['yes', 'no'] save: description: @@ -235,9 +235,9 @@ from ansible.module_utils.netcfg import NetworkConfig, dumps def get_config(module): contents = module.params['config'] if not contents: - if module.params['defaults'] is True: + if module.params['defaults']: include = 'defaults' - elif module.params['mask_passwords'] is False: + elif module.params['passwords']: include = 'passwords' else: include = None @@ -307,13 +307,13 @@ def main(): config=dict(), defaults=dict(type='bool', default=False), - mask_passwords=dict(type='bool', default=True), + passwords=dict(type='bool', default=False), backup=dict(type='bool', default=False), save=dict(type='bool', default=False), ) - mutually_exclusive = [('lines', 'src'), ('defaults', 'mask_passwords')] + mutually_exclusive = [('lines', 'src'), ('defaults', 'passwords')] required_if = [('match', 'strict', ['lines']), ('match', 'exact', ['lines']),