wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle empty role definitions in YAML (v2)

Browse source
This commit is contained in:
James Cammarata 2015-05-05 13:17:04 -05:00
parent f5471186f9
commit fba5588028
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/playbook/play.py
View file

@ -174,6 +174,9 @@ class Play(Base, Taggable, Become):
list of role definitions and creates the Role from those objects list of role definitions and creates the Role from those objects
''' '''
if ds is None:
ds = []
role_includes = load_list_of_roles(ds, variable_manager=self._variable_manager, loader=self._loader) role_includes = load_list_of_roles(ds, variable_manager=self._variable_manager, loader=self._loader)
roles = [] roles = []

3
lib/ansible/playbook/role/metadata.py
View file

@ -65,6 +65,9 @@ class RoleMetadata(Base):
which returns a list of RoleInclude objects which returns a list of RoleInclude objects
''' '''
if ds is None:
ds = []
current_role_path = None current_role_path = None
if self._owner: if self._owner:
current_role_path = os.path.dirname(self._owner._role_path) current_role_path = os.path.dirname(self._owner._role_path)