From 85328c6aa1c15c14f935d3b7f41db8354d22fb64 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Thu, 10 Nov 2016 09:58:20 +0000
Subject: [PATCH] Fixup jinja2 loader configuration

---
 .gitignore                 |  4 +++-
 snap_openstack/renderer.py | 15 ++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 963e589..62fbca5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,4 +55,6 @@ ChangeLog
 .*sw?
 
 # Files created by releasenotes build
-releasenotes/build
\ No newline at end of file
+releasenotes/build
+
+.settings
diff --git a/snap_openstack/renderer.py b/snap_openstack/renderer.py
index 47735c8..b896e37 100644
--- a/snap_openstack/renderer.py
+++ b/snap_openstack/renderer.py
@@ -26,17 +26,18 @@ class SnapFileRenderer():
     '''Helper class for rendering snap templates for runtime use'''
 
     def __init__(self):
-        self._loaders = [
-            FileSystemLoader(os.path.join(os.environ.get('SNAP'),
-                                          'templates'))
-        ]
-        self._tmpl_env = Environment(loader=self._loaders)
+        self._tmpl_env = Environment(
+            loader=FileSystemLoader(os.path.join(os.environ.get('SNAP'),
+                                                 'templates')),
+            trim_blocks=True
+        )
 
     def render(self, template_name, env):
-        '''Render j2 template using SNAP environment context
+        '''Render j2 template using SNAP environment context provided
 
         @param template_name: name of the template to use for rendering
-        @return: string of rendered context, ready to write back to a file
+        @param env: dict of variables to pass to the renderer
+        @return: string of rendered data, ready to write back to a file
         '''
         try:
             template = self._tmpl_env.get_template(template_name)