cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Save and restore the loader's basedir when loading playbooks

Browse source 
Fixes #15930
This commit is contained in:
James Cammarata 2016-05-23 14:53:18 -04:00 committed by James Tanner
parent 9e5fc8f08f
commit 3fd94769dc
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/playbook/__init__.py
View file

@ -61,6 +61,7 @@ class Playbook:
self._basedir = os.path.normpath(os.path.join(self._basedir, os.path.dirname(file_name))) self._basedir = os.path.normpath(os.path.join(self._basedir, os.path.dirname(file_name)))
# set the loaders basedir # set the loaders basedir
cur_basedir = self._loader.get_basedir()
self._loader.set_basedir(self._basedir) self._loader.set_basedir(self._basedir)
self._file_name = file_name self._file_name = file_name
@ -74,6 +75,8 @@ class Playbook:
ds = self._loader.load_from_file(os.path.basename(file_name)) ds = self._loader.load_from_file(os.path.basename(file_name))
if not isinstance(ds, list): if not isinstance(ds, list):
# restore the basedir in case this error is caught and handled
self._loader.set_basedir(cur_basedir)
raise AnsibleParserError("playbooks must be a list of plays", obj=ds) raise AnsibleParserError("playbooks must be a list of plays", obj=ds)
# Parse the playbook entries. For plays, we simply parse them # Parse the playbook entries. For plays, we simply parse them
@ -81,6 +84,8 @@ class Playbook:
# PlaybookInclude() object # PlaybookInclude() object
for entry in ds: for entry in ds:
if not isinstance(entry, dict): if not isinstance(entry, dict):
# restore the basedir in case this error is caught and handled
self._loader.set_basedir(cur_basedir)
raise AnsibleParserError("playbook entries must be either a valid play or an include statement", obj=entry) raise AnsibleParserError("playbook entries must be either a valid play or an include statement", obj=entry)
if 'include' in entry: if 'include' in entry:
@ -93,6 +98,9 @@ class Playbook:
entry_obj = Play.load(entry, variable_manager=variable_manager, loader=self._loader) entry_obj = Play.load(entry, variable_manager=variable_manager, loader=self._loader)
self._entries.append(entry_obj) self._entries.append(entry_obj)
# we're done, so restore the old basedir in the loader
self._loader.set_basedir(cur_basedir)
def get_loader(self): def get_loader(self):
return self._loader return self._loader