From 7b1c6fbab906eba6056f6c573f4b54f8e099d9f2 Mon Sep 17 00:00:00 2001
From: James Cammarata <jimi@sngx.net>
Date: Mon, 11 May 2015 12:48:03 -0500
Subject: [PATCH] Fix playbook includes so tags are obeyed (v2)

---
 lib/ansible/playbook/playbook_include.py | 5 +++--
 samples/included_playbook.yml            | 6 ++++++
 samples/test_playbook.include            | 2 ++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 samples/included_playbook.yml
 create mode 100644 samples/test_playbook.include

diff --git a/lib/ansible/playbook/playbook_include.py b/lib/ansible/playbook/playbook_include.py
index 075e6dcbdf2..1f4bddd4a32 100644
--- a/lib/ansible/playbook/playbook_include.py
+++ b/lib/ansible/playbook/playbook_include.py
@@ -61,10 +61,11 @@ class PlaybookInclude(Base, Taggable):
 
         pb._load_playbook_data(file_name=file_name, variable_manager=variable_manager)
 
-        # finally, playbook includes can specify a list of variables, which are simply
-        # used to update the vars of each play in the playbook
+        # finally, update each loaded playbook entry with any variables specified
+        # on the included playbook and/or any tags which may have been set
         for entry in pb._entries:
             entry.vars.update(new_obj.vars)
+            entry.tags = list(set(entry.tags).union(new_obj.tags))
 
         return pb
 
diff --git a/samples/included_playbook.yml b/samples/included_playbook.yml
new file mode 100644
index 00000000000..d56e9c68f7f
--- /dev/null
+++ b/samples/included_playbook.yml
@@ -0,0 +1,6 @@
+- hosts: localhost
+  gather_facts: no
+  tags:
+  - included
+  tasks:
+  - debug: msg="incuded playbook, variable is {{a}}"
diff --git a/samples/test_playbook.include b/samples/test_playbook.include
new file mode 100644
index 00000000000..95c1a821471
--- /dev/null
+++ b/samples/test_playbook.include
@@ -0,0 +1,2 @@
+- include: included_playbook.yml a=1
+  tags: include