Mark vars that shouldn't be templated with AnsibleUnsafe instead of raw

Fatsoma · Feb 28, 2019 · e6b29b7 · e6b29b7
1 parent 0055774
commit e6b29b7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/trellis/plugins/callback/vars.py b/lib/trellis/plugins/callback/vars.py
@@ -12,6 +12,7 @@
 from ansible.playbook.task import Task
 from ansible.plugins.callback import CallbackBase
 from ansible.template import Templar
+from ansible.utils.unsafe_proxy import wrap_var
 
 
 class CallbackModule(CallbackBase):
@@ -35,7 +36,7 @@ def raw_triage(self, key_string, item, patterns):
         # wrap values if they match raw_vars pattern
         elif isinstance(item, AnsibleUnicode):
             match = next((pattern for pattern in patterns if re.match(pattern, key_string)), None)
-            return AnsibleUnicode(''.join(['{% raw %}', item, '{% endraw %}'])) if not item.startswith(('{% raw', '{%raw')) and match else item
+            return wrap_var(item) if match else item
 
         else:
             return item