wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use set to quicken group host membership

Browse source 
(cherry picked from commit 3f9a885b83)
This commit is contained in:
Brian Coca 2017-09-21 22:22:01 -04:00
parent 956b6ece86
commit 2eac554eb4
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -38,6 +38,7 @@ Ansible Changes By Release
* Fix OpenBSD pkg_mgr fact (https://github.com/ansible/ansible/issues/30623) * Fix OpenBSD pkg_mgr fact (https://github.com/ansible/ansible/issues/30623)
* Fix encoding error when there are nonascii values in the path to the ssh binary * Fix encoding error when there are nonascii values in the path to the ssh binary
* removed YAML inventory group name validation, broke existing setups and should be global in any case, and configurable * removed YAML inventory group name validation, broke existing setups and should be global in any case, and configurable
* performance improvment for inventory, had slown down considerably from 2.3
<a id="2.4"></a> <a id="2.4"></a>

25
lib/ansible/inventory/group.py
View file

@ -31,6 +31,7 @@ class Group:
self.depth = 0 self.depth = 0
self.name = name self.name = name
self.hosts = [] self.hosts = []
self._hosts = set()
self.vars = {} self.vars = {}
self.child_groups = [] self.child_groups = []
self.parent_groups = [] self.parent_groups = []
@ -54,11 +55,14 @@ class Group:
for parent in self.parent_groups: for parent in self.parent_groups:
parent_groups.append(parent.serialize()) parent_groups.append(parent.serialize())
self._hosts = None
result = dict( result = dict(
name=self.name, name=self.name,
vars=self.vars.copy(), vars=self.vars.copy(),
parent_groups=parent_groups, parent_groups=parent_groups,
depth=self.depth, depth=self.depth,
hosts=self.hosts,
) )
return result return result
@ -68,6 +72,9 @@ class Group:
self.name = data.get('name') self.name = data.get('name')
self.vars = data.get('vars', dict()) self.vars = data.get('vars', dict())
self.depth = data.get('depth', 0) self.depth = data.get('depth', 0)
self.hosts = data.get('hosts', {})
self._hosts = set(self.hosts)
parent_groups = data.get('parent_groups', []) parent_groups = data.get('parent_groups', [])
for parent_data in parent_groups: for parent_data in parent_groups:
@ -112,17 +119,19 @@ class Group:
raise AnsibleError("The group named '%s' has a recursive dependency loop." % self.name) raise AnsibleError("The group named '%s' has a recursive dependency loop." % self.name)
def add_host(self, host): def add_host(self, host):
if host in self.hosts: if host.name not in self._hosts:
return self.hosts.append(host)
self.hosts.append(host) self._hosts.add(host.name)
host.add_group(self) host.add_group(self)
self.clear_hosts_cache() self.clear_hosts_cache()
def remove_host(self, host): def remove_host(self, host):
self.hosts.remove(host) if host.name in self._hosts:
host.remove_group(self) self.hosts.remove(host)
self.clear_hosts_cache() self._hosts.remove(host.name)
host.remove_group(self)
self.clear_hosts_cache()
def set_variable(self, key, value): def set_variable(self, key, value):