From eb7717aa02f2b94a4b330a153dc4df1788967e2e Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Tue, 18 Mar 2014 12:30:54 -0500
Subject: [PATCH] Make sure all tags are in a list before merging for role deps

Fixes #6557
---
 lib/ansible/playbook/play.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py
index 5d2f9e0a73..9195c5f2b6 100644
--- a/lib/ansible/playbook/play.py
+++ b/lib/ansible/playbook/play.py
@@ -234,6 +234,8 @@ class Play(object):
                         # (dep_vars) to look for tags going forward
                         def __merge_tags(var_obj):
                             old_tags = dep_vars.get('tags', [])
+                            if isinstance(old_tags, basestring):
+                                old_tags = [old_tags, ]
                             if isinstance(var_obj, dict):
                                 new_tags = var_obj.get('tags', [])
                                 if isinstance(new_tags, basestring):