Merge lp:~paulgear/charms/trusty/ntpmaster/fix-python3-on-trusty into lp:charms/trusty/ntpmaster

[Paul Gear]

Fix failure to install on trusty, due to installing the wrong python jinja2 package: http://pastebin.ubuntu.com/17430898/

[Stuart Bishop (stub)]

Nice change.

review: Approve

=== modified file 'hooks/ntpmaster_hooks.py'
--- hooks/ntpmaster_hooks.py	2016-05-02 17:27:12 +0000
+++ hooks/ntpmaster_hooks.py	2016-06-17 13:08:20 +0000
@@ -8,8 +8,8 @@
 import charmhelpers.core.host as host
 from charmhelpers.core.hookenv import UnregisteredHookError
 from charmhelpers.payload.execd import execd_preinstall
-from utils import (
-    render_template,
+from charmhelpers.contrib.templating.jinja import (
+    render,
 )
 
 NTP_CONF = '/etc/ntp.conf'
@@ -57,8 +57,8 @@
             'servers': remote_sources,
         }
         with open(NTP_CONF, "w") as ntpconf:
-            ntpconf.write(render_template(os.path.basename(NTP_CONF),
-                                          ntp_context))
+            ntpconf.write(render(os.path.basename(NTP_CONF),
+                                 ntp_context))
     else:
         shutil.copy(NTP_CONF_ORIG, NTP_CONF)
 

=== removed file 'hooks/utils.py'
--- hooks/utils.py	2013-08-29 18:39:36 +0000
+++ hooks/utils.py	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-from charmhelpers.fetch import (
-    apt_install,
-    filter_installed_packages
-)
-
-
-TEMPLATES_DIR = 'templates'
-
-try:
-    import jinja2
-except ImportError:
-    apt_install(filter_installed_packages(['python-jinja2']),
-                fatal=True)
-    import jinja2
-
-
-def render_template(template_name, context, template_dir=TEMPLATES_DIR):
-    templates = jinja2.Environment(
-        loader=jinja2.FileSystemLoader(template_dir))
-    template = templates.get_template(template_name)
-    return template.render(context)