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

Changing order of load and loadfp (#34793)

Browse source 
* Changing order of load and loadfp

* Removing exception as per Ganesh Review comments
This commit is contained in:
Anil Kumar Muraleedharan 2018-01-31 14:04:43 +05:30 committed by Ganesh Nalawade
parent 2c482847ce
commit 4e7e7042cc
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/modules/network/enos/enos_config.py
View file

@ -183,10 +183,7 @@ def get_running_config(module):
def get_candidate(module): def get_candidate(module):
candidate = NetworkConfig(indent=1) candidate = NetworkConfig(indent=1)
if module.params['src']: if module.params['src']:
try: candidate.load(module.params['src'])
candidate.loadfp(module.params['src'])
except IOError:
candidate.load(module.params['src'])
elif module.params['lines']: elif module.params['lines']:
parents = module.params['parents'] or list() parents = module.params['parents'] or list()
candidate.add(module.params['lines'], parents=parents) candidate.add(module.params['lines'], parents=parents)