summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnil Kumar Muraleedharan <amuraleedhar@lenovo.com>2018-01-31 14:04:43 +0530
committerGanesh Nalawade <ganesh634@gmail.com>2018-01-31 14:04:43 +0530
commit4e7e7042cc14ec18cfb75fdde5bfd4c160483fd7 (patch)
tree3474c71de812da649be036d8b429ca36c9bd66c5
parent2c482847ce4259283f08c1397cee4fc957075ac2 (diff)
downloadansible-4e7e7042cc14ec18cfb75fdde5bfd4c160483fd7.tar.gz
Changing order of load and loadfp (#34793)
* Changing order of load and loadfp * Removing exception as per Ganesh Review comments
-rw-r--r--lib/ansible/modules/network/enos/enos_config.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/ansible/modules/network/enos/enos_config.py b/lib/ansible/modules/network/enos/enos_config.py
index 3a316570cb..2271d39c31 100644
--- a/lib/ansible/modules/network/enos/enos_config.py
+++ b/lib/ansible/modules/network/enos/enos_config.py
@@ -183,10 +183,7 @@ def get_running_config(module):
def get_candidate(module):
candidate = NetworkConfig(indent=1)
if module.params['src']:
- try:
- candidate.loadfp(module.params['src'])
- except IOError:
- candidate.load(module.params['src'])
+ candidate.load(module.params['src'])
elif module.params['lines']:
parents = module.params['parents'] or list()
candidate.add(module.params['lines'], parents=parents)