1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

corrected host group ancestor management

This commit is contained in:
Brian Coca 2017-03-15 11:52:55 -04:00 committed by Brian Coca
parent b059a95714
commit 39ba55e5ac
3 changed files with 28 additions and 12 deletions

View file

@ -96,6 +96,8 @@ class Group:
# isn't already a group with the same name
if self.name not in [g.name for g in group.parent_groups]:
group.parent_groups.append(self)
for h in group.get_hosts():
h.populate_ancestors()
self.clear_hosts_cache()

View file

@ -106,27 +106,42 @@ class Host:
def set_gathered_facts(self, gathered):
self._gathered_facts = gathered
def populate_ancestors(self):
# populate ancestors
for group in self.groups:
self.add_group(group)
def add_group(self, group):
# populate ancestors
for oldg in group.get_ancestors():
if oldg not in self.groups:
self.add_group(oldg)
if group not in self.groups:
self.groups.append(group)
def remove_group(self, group):
if group in self.groups:
self.groups.remove(group)
# remove exclusive ancestors, xcept all!
for oldg in group.get_ancestors():
if oldg.name != 'all':
for childg in self.groups:
if oldg in childg.get_ancestors():
break
else:
self.remove_group(oldg)
def set_variable(self, key, value):
self.vars[key]=value
def get_groups(self):
groups = {}
for g in self.groups:
groups[g.name] = g
ancestors = g.get_ancestors()
for a in ancestors:
groups[a.name] = a
return groups.values()
return self.groups
def get_vars(self):

View file

@ -403,8 +403,7 @@ class VariableManager:
variables['ansible_playbook_python'] = sys.executable
if host:
variables['group_names'] = sorted([group.name for group in host.get_groups() if group.name != 'all'])
# host already provides some magic vars via host.get_vars()
if self._inventory:
variables['groups'] = self._inventory.get_group_dict()