Merge lp:~nick-moffitt/charm-helpers/pass-more-data-to-context-dict-for-templates into lp:charm-helpers

[Nick Moffitt]

Right now the only way to add data to the context dictionary that is used in write_file is to poke strings into os.environ (because that's only made once when os is imported). This change will allow you to push your own keyword args into render_template_file and write_file that will appear alongside "conf" and "rel" and "env" etc in the context dictionary.

=== modified file 'charmhelpers/core/host.py'
--- charmhelpers/core/host.py	2013-05-30 11:20:54 +0000
+++ charmhelpers/core/host.py	2013-05-30 11:20:54 +0000
@@ -106,9 +106,10 @@
     os.chown(realpath, uid, gid)
 
 
-def write_file(path, fmtstr, owner='root', group='root', perms=0444):
+def write_file(path, fmtstr, owner='root', group='root', perms=0444, **kwargs):
     """Create or overwrite a file with the contents of a string"""
     context = execution_environment()
+    context.update(kwargs)
     log("Writing file {} {}:{} {:o}".format(path, owner, group,
         perms))
     uid = pwd.getpwnam(owner.format(**context)).pw_uid