internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement default omit correctly

Browse Source
This commit is contained in:
Victor Lin
2014-07-28 18:44:40 -07:00
committed by James Cammarata
parent 0b4d7f1574
commit bce6642ab6
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/ansible/runner/__init__.py
View File

@@ -870,10 +870,6 @@ class Runner(object):
if type(module_args) == dict:
new_args = []
for (k, v) in module_args.iteritems():
# see if the value is OMIT_PLACE_HOLDER, if it is, skip it
arg_value = template.template(self.basedir, v, inject, fail_on_undefined=self.error_on_undefined_vars)
if arg_value.strip() == OMIT_PLACE_HOLDER:
continue
new_args.append("%s='%s'" % (k, v))
module_args = ' '.join(new_args)
@@ -897,6 +893,13 @@ class Runner(object):
except jinja2.exceptions.UndefinedError, e:
raise errors.AnsibleUndefinedVariable("One or more undefined variables: %s" % str(e))
# filter omitted arguments out
new_complex_args = {}
for key, value in complex_args.iteritems():
if value == OMIT_PLACE_HOLDER:
continue
new_complex_args[key] = value
complex_args = new_complex_args
result = handler.run(conn, tmp, module_name, module_args, inject, complex_args)
# Code for do until feature