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

fix for filter fix

Browse source 
(cherry picked from commit 5d043b65d3)
This commit is contained in:
Brian Coca 2016-11-17 13:41:57 -05:00
parent 78e47b4bbd
commit d6ab369916
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/plugins/action/__init__.py
View file

@ -688,7 +688,7 @@ class ActionBase(with_metaclass(ABCMeta, object)):
data = json.loads(self._filter_non_json_lines(res.get('stdout', u'')))
data['_ansible_parsed'] = True
if 'ansible_facts' in data and isinstance(data['ansible_facts'], dict):
remove_keys = set(['ansible_rsync_path'])
remove_keys = set()
fact_keys = set(data['ansible_facts'].keys())
# first we add all of our magic variable names to the set of
# keys we want to remove from facts
@ -704,6 +704,12 @@ class ActionBase(with_metaclass(ABCMeta, object)):
remove_keys.add(fact_key)
except AttributeError:
pass
# remove some KNOWN keys
for hard in ['ansible_rsync_path']:
if hard in fact_keys:
remove_keys.add(hard)
# finally, we search for interpreter keys to remove
re_interp = re.compile('^ansible_.*_interpreter$')
for fact_key in fact_keys: