From ad70e9bcd633e9c088d912d81ef97d56c696e62a Mon Sep 17 00:00:00 2001
From: James Tanner <tanner.jc@gmail.com>
Date: Mon, 17 Mar 2014 16:54:25 -0400
Subject: [PATCH] Fixes #6227 skip non-unicode strings and catch decode errors
 silently in template_from_string

---
 lib/ansible/utils/template.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/ansible/utils/template.py b/lib/ansible/utils/template.py
index fc4ff9fd20..0b86954e88 100644
--- a/lib/ansible/utils/template.py
+++ b/lib/ansible/utils/template.py
@@ -310,7 +310,13 @@ def template_from_string(basedir, data, vars, fail_on_undefined=False):
             if os.path.exists(filesdir):
                 basedir = filesdir
 
-        data = data.decode('utf-8')
+        # 6227
+        if isinstance(data, unicode):
+            try:
+                data = data.decode('utf-8')
+            except UnicodeEncodeError, e:
+                pass
+
         try:
             t = environment.from_string(data)
         except Exception, e: