diff options
author | Brian Coca <brian.coca+git@gmail.com> | 2016-11-17 13:41:57 -0500 |
---|---|---|
committer | Brian Coca <brian.coca+git@gmail.com> | 2016-11-17 13:42:51 -0500 |
commit | d6ab3699160d3ded0811eb487963e5e4cdb947be (patch) | |
tree | 3b59999f5800e24cdc2daf9a1efa0ae5482b4575 | |
parent | 78e47b4bbd9127fea8c496c7bd058295593d6f10 (diff) | |
download | ansible-d6ab3699160d3ded0811eb487963e5e4cdb947be.tar.gz |
fix for filter fix
(cherry picked from commit 5d043b65d355b8d7ef2696d457a916e607756ee6)
-rw-r--r-- | lib/ansible/plugins/action/__init__.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/ansible/plugins/action/__init__.py b/lib/ansible/plugins/action/__init__.py index 66bcd8b75d..12b397893f 100644 --- a/lib/ansible/plugins/action/__init__.py +++ b/lib/ansible/plugins/action/__init__.py @@ -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: |