cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bug fix in asa_acl module for missing candidate config

Browse source 
This bug was introduced accidentally when refactoring to 2.2.  The instance
of the candidate config was deleted.  This adds the candidate config
instance back

fixes #2890
This commit is contained in:
Peter Sprygada 2016-09-12 16:45:56 -04:00 committed by Matt Clay
parent 62575fdf48
commit 7ce98f52cf
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/modules/extras/network/asa/asa_acl.py
View file

@ -128,8 +128,10 @@ responses:
type: list type: list
sample: ['...', '...'] sample: ['...', '...']
""" """
import ansible.module_utils.asa
from ansible.module_utils.netcfg import NetworkConfig from ansible.module_utils.netcfg import NetworkConfig
from ansible.module_utils.asa import NetworkModule from ansible.module_utils.network import NetworkModule
def get_config(module): def get_config(module):
@ -179,16 +181,22 @@ def main():
match = module.params['match'] match = module.params['match']
replace = module.params['replace'] replace = module.params['replace']
candidate = NetworkConfig(indent=1)
candidate.add(lines)
module.filter = check_input_acl(lines, module) module.filter = check_input_acl(lines, module)
if not module.params['force']: if not module.params['force']:
contents = get_config(module)
config = NetworkConfig(indent=1, contents=contents)
commands = candidate.difference(config) commands = candidate.difference(config)
commands = dumps(commands, 'commands').split('\n') commands = dumps(commands, 'commands').split('\n')
commands = [str(c) for c in commands if c]
else: else:
commands = str(candidate).split('\n') commands = str(candidate).split('\n')
if commands: if commands:
if not module.check_mode: if not module.check_mode:
commands = [str(c) for c in commands if c]
response = module.config(commands) response = module.config(commands)
result['responses'] = response result['responses'] = response
result['changed'] = True result['changed'] = True