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

Allow omit to be used on Playbook-level fields

Browse source 
Fixes #11173
This commit is contained in:
James Cammarata 2015-07-15 13:53:59 -04:00
parent d6b058eaae
commit 9fe0f21f6a
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -250,6 +250,9 @@ class Base:
if self._loader is not None: if self._loader is not None:
basedir = self._loader.get_basedir() basedir = self._loader.get_basedir()
# save the omit value for later checking
omit_value = templar._available_variables.get('omit')
for (name, attribute) in iteritems(self._get_base_attributes()): for (name, attribute) in iteritems(self._get_base_attributes()):
if getattr(self, name) is None: if getattr(self, name) is None:
@ -268,6 +271,12 @@ class Base:
# if the attribute contains a variable, template it now # if the attribute contains a variable, template it now
value = templar.template(getattr(self, name)) value = templar.template(getattr(self, name))
# if this evaluated to the omit value, set the value back to
# the default specified in the FieldAttribute and move on
if omit_value is not None and value == omit_value:
value = attribute.default
continue
# and make sure the attribute is of the type it should be # and make sure the attribute is of the type it should be
if value is not None: if value is not None:
if attribute.isa == 'string': if attribute.isa == 'string':
@ -284,7 +293,7 @@ class Base:
if not isinstance(item, attribute.listof): if not isinstance(item, attribute.listof):
raise AnsibleParserError("the field '%s' should be a list of %s, but the item '%s' is a %s" % (name, attribute.listof, item, type(item)), obj=self.get_ds()) raise AnsibleParserError("the field '%s' should be a list of %s, but the item '%s' is a %s" % (name, attribute.listof, item, type(item)), obj=self.get_ds())
elif attribute.isa == 'dict' and not isinstance(value, dict): elif attribute.isa == 'dict' and not isinstance(value, dict):
raise TypeError() raise TypeError("%s is not a dictionary" % value)
# and assign the massaged value back to the attribute field # and assign the massaged value back to the attribute field
setattr(self, name, value) setattr(self, name, value)