Merge lp:~tribaal/charms/trusty/ntp/use-charm-helpers-templating into lp:charms/trusty/ntp

[Chris Glass]

This branch removes the copy/pasted jinja templating code and makes the charm use the charmhelpers version instead.

[Cory Johns (johnsca)]

Chris,

This change looks good. I have one question about the in-memory apt_pkg change. Since hooks won't ever run concurrently, is there really a need for that change? That said, it won't hurt, but if there really is a concern about collisions, should be it merged upstream?

Regardless, this MP gets my +1.

review: Approve

[Charles Butler (lazypower)]

Merged,

Thanks for the fix tribaal

review: Approve

=== modified file 'charm-helpers-sync.yaml'
--- charm-helpers-sync.yaml	2013-08-29 18:41:41 +0000
+++ charm-helpers-sync.yaml	2014-08-05 05:46:38 +0000
@@ -3,3 +3,4 @@
 include:
     - core
     - fetch
+    - contrib.templating.jinja

=== modified file 'hooks/charmhelpers/core/host.py'
--- hooks/charmhelpers/core/host.py	2014-07-16 05:40:55 +0000
+++ hooks/charmhelpers/core/host.py	2014-08-05 05:46:38 +0000
@@ -322,6 +322,10 @@
     import apt_pkg
     if not pkgcache:
         apt_pkg.init()
+        # Force Apt to build its cache in memory. That way we avoid race
+        # conditions with other applications building the cache in the same
+        # place.
+        apt_pkg.config.set("Dir::Cache::pkgcache", "")
         pkgcache = apt_pkg.Cache()
     pkg = pkgcache[package]
     return apt_pkg.version_compare(pkg.current_ver.ver_str, revno)

=== modified file 'hooks/ntp_hooks.py'
--- hooks/ntp_hooks.py	2013-08-29 21:07:57 +0000
+++ hooks/ntp_hooks.py	2014-08-05 05:46:38 +0000
@@ -5,11 +5,10 @@
 import charmhelpers.core.host as host
 import charmhelpers.fetch as fetch
 from charmhelpers.core.hookenv import UnregisteredHookError
+from charmhelpers.contrib.templating.jinja import render
 import shutil
 import os
-from utils import (
-    render_template,
-)
+
 
 NTP_CONF = '/etc/ntp.conf'
 NTP_CONF_ORIG = '{}.orig'.format(NTP_CONF)
@@ -46,8 +45,8 @@
         shutil.copy(NTP_CONF_ORIG, NTP_CONF)
     else:
         with open(NTP_CONF, "w") as ntpconf:
-            ntpconf.write(render_template(os.path.basename(NTP_CONF),
-                                          {'servers': remote_sources}))
+            ntpconf.write(render(os.path.basename(NTP_CONF),
+                                 {'servers': remote_sources}))
 
 
 if __name__ == '__main__':

=== removed file 'hooks/utils.py'
--- hooks/utils.py	2013-08-29 18:41:41 +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)