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

Also check the play basedir for the role

Browse source 
Fixes #11328
This commit is contained in:
James Cammarata 2015-07-20 14:47:38 -04:00
parent dca36c1d16
commit 5347db2952
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/ansible/playbook/role/definition.py
View file

@ -129,7 +129,12 @@ class RoleDefinition(Base, Become, Conditional, Taggable):
return (role_name, role_path) return (role_name, role_path)
else: else:
# we always start the search for roles in the base directory of the playbook # we always start the search for roles in the base directory of the playbook
role_search_paths = [os.path.join(self._loader.get_basedir(), u'roles'), u'./roles', u'./'] role_search_paths = [
os.path.join(self._loader.get_basedir(), u'roles'),
u'./roles',
self._loader.get_basedir(),
u'./'
]
# also search in the configured roles path # also search in the configured roles path
if C.DEFAULT_ROLES_PATH: if C.DEFAULT_ROLES_PATH: