Check for skipped tags in passed role variables before adding to them

jimi-c · jimi-c · commit 04a6dc6d1280 · 2014-03-08T18:55:42.000-06:00
Fixes ansible#6330
diff --git a/lib/ansible/playbook/play.py b/lib/ansible/playbook/play.py
@@ -227,6 +227,13 @@ def _build_role_dependencies(self, roles, dep_stack, passed_vars={}, level=0):
                             if meta_data:
                                 allow_dupes = utils.boolean(meta_data.get('allow_duplicates',''))
 
+                        if "tags" in passed_vars:
+                            if not self._is_valid_tag(passed_vars["tags"]):
+                                # one of the tags specified for this role was in the
+                                # skip list, or we're limiting the tags and it didn't 
+                                # match one, so we just skip it completely
+                                continue
+
                         # if any tags were specified as role/dep variables, merge
                         # them into the passed_vars so they're passed on to any 
                         # further dependencies too, and so we only have one place
@@ -268,13 +275,6 @@ def __merge_tags(var_obj):
                         if 'role' in dep_vars:
                             del dep_vars['role']
 
-                        if "tags" in passed_vars:
-                            if not self._is_valid_tag(passed_vars["tags"]):
-                                # one of the tags specified for this role was in the
-                                # skip list, or we're limiting the tags and it didn't 
-                                # match one, so we just skip it completely
-                                continue
-
                         if not allow_dupes:
                             if dep in self.included_roles:
                                 # skip back to the top, since we don't want to
