Revert "update mask_passwords argument to be more descriptive in asa_config (#3109)" (#3110)

This reverts commit 271e300745b7200fc57383916d87efd6640d093e.
This commit is contained in:
Peter Sprygada 2016-10-06 16:42:00 -04:00 committed by Matt Clay
commit 00cc7c03fa

View file

@ -146,14 +146,14 @@ options:
required: false required: false
default: no default: no
choices: ['yes', 'no'] choices: ['yes', 'no']
mask_passwords: passwords:
description: description:
- This argument specifies to include passwords in the config - This argument specifies to include passwords in the config
when retrieving the running-config from the remote device. This when retrieving the running-config from the remote device. This
includes passwords related to VPN endpoints. This argument is includes passwords related to VPN endpoints. This argument is
mutually exclusive with I(defaults). mutually exclusive with I(defaults).
required: true required: false
default: true default: no
choices: ['yes', 'no'] choices: ['yes', 'no']
save: save:
description: description:
@ -235,9 +235,9 @@ from ansible.module_utils.netcfg import NetworkConfig, dumps
def get_config(module): def get_config(module):
contents = module.params['config'] contents = module.params['config']
if not contents: if not contents:
if module.params['defaults'] is True: if module.params['defaults']:
include = 'defaults' include = 'defaults'
elif module.params['mask_passwords'] is False: elif module.params['passwords']:
include = 'passwords' include = 'passwords'
else: else:
include = None include = None
@ -307,13 +307,13 @@ def main():
config=dict(), config=dict(),
defaults=dict(type='bool', default=False), 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), backup=dict(type='bool', default=False),
save=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']), required_if = [('match', 'strict', ['lines']),
('match', 'exact', ['lines']), ('match', 'exact', ['lines']),