summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGanesh Nalawade <ganesh634@gmail.com>2019-05-04 07:23:12 -0400
committerMatt Clay <matt@mystile.com>2019-05-09 12:40:19 -0700
commit457efa8136ea12d3bcedf9146e3cd415448628e5 (patch)
tree835cf35b690fe72c81ba795668b3161b2146e084
parente925dd7713d084077ebe2714dec222bd7a3f54a1 (diff)
downloadansible-457efa8136ea12d3bcedf9146e3cd415448628e5.tar.gz
Fix invalid src option return response for network config modules (#56076)
* Add changed key in faliure case to maintain backward compatibility (cherry picked from commit 1a66121f0319793f05e969b94b4642e6475e6462)
-rw-r--r--changelogs/fragments/networkos_config_src_option_fix.yaml2
-rw-r--r--lib/ansible/plugins/action/network.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/fragments/networkos_config_src_option_fix.yaml b/changelogs/fragments/networkos_config_src_option_fix.yaml
new file mode 100644
index 0000000000..f73c4c265c
--- /dev/null
+++ b/changelogs/fragments/networkos_config_src_option_fix.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+ - Fix invalid src option return response for network config modules (https://github.com/ansible/ansible/pull/56076)
diff --git a/lib/ansible/plugins/action/network.py b/lib/ansible/plugins/action/network.py
index d7b8a61f42..277dc70895 100644
--- a/lib/ansible/plugins/action/network.py
+++ b/lib/ansible/plugins/action/network.py
@@ -40,7 +40,10 @@ class ActionModule(_ActionModule):
def run(self, task_vars=None):
config_module = hasattr(self, '_config_module') and self._config_module
if config_module and self._task.args.get('src'):
- self._handle_src_option()
+ try:
+ self._handle_src_option()
+ except AnsibleError as e:
+ return {'failed': True, 'msg': e.message, 'changed': False}
result = super(ActionModule, self).run(task_vars=task_vars)