ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-06-28 03:00:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Inject existing groups at InventoryDir initialization

Browse source 
This fixes a corner case where ini files live in a subdir
of the main inventory directory.

Reproducing the original error:

mkdir -p inventory/ini
cat > inventory/ini/hosts << EOF
[www]
www1
EOF

$ ansible -i inventory/ all -m ping
ERROR! 'all'

(or without the [www] group, it would complain about 'ungrouped')
This commit is contained in:
Serge van Ginderachter 2015-09-29 17:19:31 +02:00
parent f42f5e6740
commit 7461ba9998
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/inventory/dir.py
View file

@ -107,7 +107,7 @@ class InventoryDirectory(object):
continue continue
fullpath = os.path.join(self.directory, i) fullpath = os.path.join(self.directory, i)
if os.path.isdir(fullpath): if os.path.isdir(fullpath):
parser = InventoryDirectory(loader=loader, filename=fullpath) parser = InventoryDirectory(loader=loader, groups=groups, filename=fullpath)
else: else:
parser = get_file_parser(fullpath, self.groups, loader) parser = get_file_parser(fullpath, self.groups, loader)
if parser is None: if parser is None: