ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-18 19:00:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Don't use an unset playbook basedir when searching for hostgroup vars

Browse source 
The flag new_pb_basedir is not being utilized in Inventory._get_hostgroup_vars,
leading to the situation where an inventory with no playbook basedir set will
read host/group vars from the $CWD, regardless of the inventory and/or playbook
relative location. This patch corrects that by not using the playbook basedir
if it is unset (None).

This patch also corrects a bug in which the VariableManager would accumulate
host/group vars files, which could lead to incorrect vars files being used when
playbooks are run from different directories containing their own group/host vars
directories.

Fixes #16953
This commit is contained in:
James Cammarata 2016-08-17 14:44:06 -05:00
commit b617d62203
3 changed files with 24 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/executor/playbook_executor.py
View file

@ -72,7 +72,7 @@ class PlaybookExecutor:
try:
for playbook_path in self._playbooks:
pb = Playbook.load(playbook_path, variable_manager=self._variable_manager, loader=self._loader)
self._inventory.set_playbook_basedir(os.path.dirname(playbook_path))
self._inventory.set_playbook_basedir(os.path.realpath(os.path.dirname(playbook_path)))
if self._tqm is None: # we are doing a listing
entry = {'playbook': playbook_path}