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

complex_arg templating should be smarter. Make it so!

Browse source
This commit is contained in:
Michael DeHaan 2013-04-25 21:10:54 -04:00
parent ee4a0fc6a0
commit 224e20ca60
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/runner/__init__.py
View file

@ -239,9 +239,8 @@ class Runner(object):
if not self.environment:
return ""
enviro = template.template(self.basedir, self.environment, inject)
if isinstance(enviro, basestring) and enviro in inject:
enviro = inject[enviro]
enviro = template.template(self.basedir, self.environment, inject, convert_bare=True)
enviro = utils.safe_eval(enviro)
if type(enviro) != dict:
raise errors.AnsibleError("environment must be a dictionary, received %s" % enviro)
result = ""
@ -406,15 +405,14 @@ class Runner(object):
# logic to replace complex args if possible
complex_args = self.complex_args
if isinstance(complex_args, basestring):
if complex_args in inject:
complex_args = inject[complex_args]
else:
complex_args = template.template(self.basedir, complex_args, inject)
complex_args = utils.safe_eval(complex_args)
# logic to decide how to run things depends on whether with_items is used
if items is None:
if isinstance(complex_args, basestring):
complex_args = template.template(self.basedir, complex_args, inject, convert_bare=True)
complex_args = utils.safe_eval(complex_args)
if type(complex_args) != dict:
raise errors.AnsibleError("args must be a dictionary, received %s" % complex_args)
return self._executor_internal_inner(host, self.module_name, self.module_args, inject, port, complex_args=complex_args)
elif len(items) > 0:
@ -428,6 +426,14 @@ class Runner(object):
results = []
for x in items:
inject['item'] = x
# TODO: this idiom should be replaced with an up-conversion to a Jinja2 template evaluation
if isinstance(complex_args, basestring):
complex_args = template.template(self.basedir, complex_args, inject, convert_bare=True)
complex_args = utils.safe_eval(complex_args)
if type(complex_args) != dict:
raise errors.AnsibleError("args must be a dictionary, received %s" % complex_args)
result = self._executor_internal_inner(
host,
self.module_name,

11
lib/ansible/utils/template.py
View file

@ -266,9 +266,16 @@ def legacy_varReplace(basedir, raw, vars, lookup_fatal=True, depth=0, expand_lis
return ''.join(done)
def template(basedir, varname, vars, lookup_fatal=True, depth=0, expand_lists=True):
# TODO: varname is misnamed here
def template(basedir, varname, vars, lookup_fatal=True, depth=0, expand_lists=True, convert_bare=False):
''' templates a data structure by traversing it and substituting for other data structures '''
if convert_bare and isinstance(varname, basestring):
first_part = varname.split(".")[0].split("[")[0]
if first_part in vars and '{{' not in varname and '$' not in varname:
varname = "{{%s}}" % varname
if isinstance(varname, basestring):
if '{{' in varname or '{%' in varname:
varname = template_from_string(basedir, varname, vars)
@ -439,7 +446,7 @@ def template_from_file(basedir, path, vars):
def template_from_string(basedir, data, vars):
''' run a file through the (Jinja2) templating engine '''
try:
if type(data) == str:
data = unicode(data, 'utf-8')