mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Make add_host clear the inventory pattern cache, add some more aliases. Fixes #4442.
This commit is contained in:
parent
9c9ec52b04
commit
41aaad69aa
3 changed files with 12 additions and 4 deletions
|
@ -266,6 +266,10 @@ class Inventory(object):
|
|||
self._pattern_hosts[pattern] = results
|
||||
return self._pattern_hosts[pattern]
|
||||
|
||||
def clear_pattern_cache(self):
|
||||
''' called exclusively by the add_host plugin to allow patterns to be recalculated '''
|
||||
self._pattern_hosts = {}
|
||||
|
||||
def groups_for_host(self, host):
|
||||
results = []
|
||||
groups = self.get_groups()
|
||||
|
|
|
@ -68,14 +68,14 @@ class ActionModule(object):
|
|||
# only groups can be added directly to inventory
|
||||
inventory._hosts_cache[new_name] = new_host
|
||||
allgroup.add_host(new_host)
|
||||
|
||||
|
||||
# Add any variables to the new_host
|
||||
for k in args.keys():
|
||||
if not k in [ 'name', 'hostname', 'groupname', 'groups' ]:
|
||||
new_host.set_variable(k, args[k])
|
||||
|
||||
|
||||
groupnames = args.get('groupname', args.get('groups', ''))
|
||||
groupnames = args.get('groupname', args.get('groups', args.get('group', '')))
|
||||
# add it to the group if that was specified
|
||||
if groupnames != '':
|
||||
for group_name in groupnames.split(","):
|
||||
|
@ -88,6 +88,10 @@ class ActionModule(object):
|
|||
result['new_groups'] = groupnames.split(",")
|
||||
|
||||
result['new_host'] = new_name
|
||||
|
||||
# clear pattern caching completely since it's unpredictable what
|
||||
# patterns may have referenced the group
|
||||
inventory.clear_pattern_cache()
|
||||
|
||||
return ReturnData(conn=conn, comm_ok=True, result=result)
|
||||
|
||||
|
|
|
@ -10,12 +10,12 @@ description:
|
|||
version_added: "0.9"
|
||||
options:
|
||||
name:
|
||||
aliases: [ 'hostname' ]
|
||||
aliases: [ 'hostname', 'host' ]
|
||||
description:
|
||||
- The hostname/ip of the host to add to the inventory, can include a colon and a port number.
|
||||
required: true
|
||||
groups:
|
||||
aliases: [ 'groupname' ]
|
||||
aliases: [ 'groupname', 'group' ]
|
||||
description:
|
||||
- The groups to add the hostname to, comma separated.
|
||||
required: false
|
||||
|
|
Loading…
Reference in a new issue