Merge pull request #977 from jpmens/fromjson

Jinja2 filter from_json added, to_json renamed

lib/ansible/utils.py

@@ -241,7 +241,8 @@ def template_from_file(basedir, path, vars):
     ''' run a file through the templating engine '''
 
     environment = jinja2.Environment(loader=jinja2.FileSystemLoader(basedir), trim_blocks=False)
-    environment.filters['tojson'] = json.dumps
+    environment.filters['to_json'] = json.dumps
+    environment.filters['from_json'] = json.loads
     data = codecs.open(path_dwim(basedir, path), encoding="utf8").read()
     t = environment.from_string(data)
     vars = vars.copy()