wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't post_validate vars and vars_files on Play objects

Browse source 
Fixes #11343
This commit is contained in:
James Cammarata 2015-06-22 11:23:23 -04:00
parent ff251a0dcc
commit cb5f630f33
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/playbook/base.py
View file

@ -254,15 +254,17 @@ class Base:
raise AnsibleParserError("the field '%s' is required but was not set" % name)
try:
# if the attribute contains a variable, template it now
value = templar.template(getattr(self, name))
# run the post-validator if present
# Run the post-validator if present. These methods are responsible for
# using the given templar to template the values, if required.
method = getattr(self, '_post_validate_%s' % name, None)
if method:
value = method(attribute, value, all_vars, templar._fail_on_undefined_errors)
value = method(attribute, getattr(self, name), templar)
else:
# otherwise, just make sure the attribute is of the type it should be
# if the attribute contains a variable, template it now
value = templar.template(getattr(self, name))
# and make sure the attribute is of the type it should be
if value is not None:
if attribute.isa == 'string':
value = unicode(value)
elif attribute.isa == 'int':

14
lib/ansible/playbook/play.py
View file

@ -187,6 +187,20 @@ class Play(Base, Taggable, Become):
roles.append(Role.load(ri))
return roles
def _post_validate_vars(self, attr, value, templar):
'''
Override post validation of vars on the play, as we don't want to
template these too early.
'''
return value
def _post_validate_vars_files(self, attr, value, templar):
'''
Override post validation of vars_files on the play, as we don't want to
template these too early.
'''
return value
# FIXME: post_validation needs to ensure that become/su/sudo have only 1 set
def _compile_roles(self):