Yaml inventory more tolerant (#48883)

* make yaml inv more tolerant to comments
* add tests for bad inventory processing

fixes #47254
This commit is contained in:
Brian Coca 2018-11-30 22:04:39 -05:00 committed by GitHub
parent bd1050dfc7
commit fc71cde7d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 112 additions and 1 deletions

View file

@ -135,7 +135,13 @@ class InventoryModule(BaseFileInventoryPlugin):
for key in group_data:
if key == 'vars':
if not isinstance(group_data[key], (MutableMapping, NoneType)):
self.display.warning('Skipping key (%s) in group (%s) as it is not a mapping, it is a %s' % (key, group, type(group_data[key])))
continue
if isinstance(group_data[key], NoneType):
self.display.vvv('Skipping empty key (%s) in group (%s)' % (key, group))
elif key == 'vars':
for var in group_data[key]:
self.inventory.set_variable(group, var, group_data[key][var])
elif key == 'children':