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

Moved the _inventory.clear_group_dict_cache() from creating a group w… (#17766)

Browse source 
* Moved the _inventory.clear_group_dict_cache() from creating a group which doesn't exist, to adding members to the group.

* Update __init__.py

Update to use changed: block to catch all changes for cache clear as suggested

(cherry picked from commit b91d4d884d)
This commit is contained in:
jamessewell 2016-11-19 06:27:17 +11:00 committed by James Cammarata
parent 35e198a616
commit c2f9846278
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/plugins/strategy/__init__.py
View file

@ -624,9 +624,6 @@ class StrategyBase:
group_name = result_item.get('add_group') group_name = result_item.get('add_group')
new_group = self._inventory.get_group(group_name) new_group = self._inventory.get_group(group_name)
if not new_group: if not new_group:
# clear cache of group dict, which is used in magic host variables
self._inventory.clear_group_dict_cache()
# create the new group and add it to inventory # create the new group and add it to inventory
new_group = Group(name=group_name) new_group = Group(name=group_name)
self._inventory.add_group(new_group) self._inventory.add_group(new_group)
@ -641,6 +638,10 @@ class StrategyBase:
new_group.add_host(real_host) new_group.add_host(real_host)
changed = True changed = True
if changed:
# clear cache of group dict, which is used in magic host variables
self._inventory.clear_group_dict_cache()
return changed return changed
def _load_included_file(self, included_file, iterator, is_handler=False): def _load_included_file(self, included_file, iterator, is_handler=False):