Better error for bad role def

(cherry picked from commit ff1e52184fed2589abea174c15a1ad7b3e761221)

1 files changed, 4 insertions, 1 deletions

diff --git a/lib/ansible/playbook/role/include.py b/lib/ansible/playbook/role/include.py
index 43e2d9e4fc..78079b3813 100644
--- a/lib/ansible/playbook/role/include.py
+++ b/lib/ansible/playbook/role/include.py
@@ -28,6 +28,7 @@ from ansible.parsing.yaml.objects import AnsibleBaseYAMLObject
 from ansible.playbook.attribute import Attribute, FieldAttribute
 from ansible.playbook.role.definition import RoleDefinition
 from ansible.playbook.role.requirement import RoleRequirement
+from ansible.module_utils._text import to_native
 
 
 __all__ = ['RoleInclude']
@@ -49,7 +50,9 @@ class RoleInclude(RoleDefinition):
     @staticmethod
     def load(data, play, current_role_path=None, parent_role=None, variable_manager=None, loader=None):
 
-        assert isinstance(data, string_types) or isinstance(data, dict) or isinstance(data, AnsibleBaseYAMLObject)
+        if not (isinstance(data, string_types) or isinstance(data, dict) or isinstance(data, AnsibleBaseYAMLObject)):
+            raise AnsibleParserError("Invalid role definition: %s" % to_native(data))
+
         if isinstance(data, string_types) and ',' in data:
             data = RoleRequirement.role_spec_parse(data)