summaryrefslogtreecommitdiffstats
path: root/roles/lib_utils/src/ansible/yedit.py
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2017-03-27 09:41:15 -0400
committerKenny Woodson <kwoodson@redhat.com>2017-03-28 15:55:50 -0400
commitb7af36569f4f02a6320833759b48e15df25a9b06 (patch)
treefdb1cf2e878314eec7572018af189d3ba0c0eada /roles/lib_utils/src/ansible/yedit.py
parentaa9e19c20b745f91a47292f8754a8cf52017c3e4 (diff)
downloadopenshift-b7af36569f4f02a6320833759b48e15df25a9b06.tar.gz
openshift-b7af36569f4f02a6320833759b48e15df25a9b06.tar.bz2
openshift-b7af36569f4f02a6320833759b48e15df25a9b06.tar.xz
openshift-b7af36569f4f02a6320833759b48e15df25a9b06.zip
Fixed a bug in oc_volume.
Diffstat (limited to 'roles/lib_utils/src/ansible/yedit.py')
-rw-r--r--roles/lib_utils/src/ansible/yedit.py22
1 files changed, 20 insertions, 2 deletions
diff --git a/roles/lib_utils/src/ansible/yedit.py b/roles/lib_utils/src/ansible/yedit.py
index bdb9915d6..c4b818cf1 100644
--- a/roles/lib_utils/src/ansible/yedit.py
+++ b/roles/lib_utils/src/ansible/yedit.py
@@ -32,8 +32,26 @@ def main():
required_one_of=[["content", "src"]],
)
- if module.params['src'] is not None and module.params['key'] in [None, '']:
- module.fail_json(failed=True, msg='Empty value for parameter key not allowed.')
+ # Verify we recieved either a valid key or edits with valid keys when receiving a src file.
+ # A valid key being not None or not ''.
+ if module.params['src'] is not None:
+ key_error = False
+ edit_error = False
+
+ if module.params['key'] in [None, '']:
+ key_error = True
+
+ if module.params['edits'] in [None, []]:
+ edit_error = True
+
+ else:
+ for edit in module.params['edits']:
+ if edit.get('key') in [None, '']:
+ edit_error = True
+ break
+
+ if key_error and edit_error:
+ module.fail_json(failed=True, msg='Empty value for parameter key not allowed.')
rval = Yedit.run_ansible(module.params)
if 'failed' in rval and rval['failed']: