Merge pull request #1826 from willthames/new_template_variables

Added additional template variables
This commit is contained in:
Michael DeHaan 2013-01-04 15:31:14 -08:00
commit 435905defa
2 changed files with 6 additions and 3 deletions

View file

@ -303,6 +303,8 @@ def template_from_file(basedir, path, vars):
vars['template_path'] = realpath vars['template_path'] = realpath
vars['template_mtime'] = datetime.datetime.fromtimestamp(os.path.getmtime(realpath)) vars['template_mtime'] = datetime.datetime.fromtimestamp(os.path.getmtime(realpath))
vars['template_uid'] = template_uid vars['template_uid'] = template_uid
vars['template_fullpath'] = os.path.abspath(realpath)
vars['template_run_date'] = datetime.datetime.now()
managed_default = C.DEFAULT_MANAGED_STR managed_default = C.DEFAULT_MANAGED_STR
managed_str = managed_default.format( managed_str = managed_default.format(

View file

@ -9,12 +9,13 @@ description:
(U(http://jinja.pocoo.org/docs/)) - documentation on the template (U(http://jinja.pocoo.org/docs/)) - documentation on the template
formatting can be found in the Template Designer Documentation formatting can be found in the Template Designer Documentation
(U(http://jinja.pocoo.org/docs/templates/)). (U(http://jinja.pocoo.org/docs/templates/)).
- "Four additional variables can be used in templates: C(ansible_managed) - "Six additional variables can be used in templates: C(ansible_managed)
(configurable via the C(defaults) section of C(ansible.cfg)) contains a string (configurable via the C(defaults) section of C(ansible.cfg)) contains a string
which can be used to describe the template name, host, modification time of the which can be used to describe the template name, host, modification time of the
template file and the owner uid, C(template_host) contains the node name of template file and the owner uid, C(template_host) contains the node name of
the template's machine, C(template_uid) the owner, and C(template_path) the the template's machine, C(template_uid) the owner, C(template_path) the
file name." relative path of the template, C(template_fullpath) is the absolute path of the
template, and C(template_run_date) is the date that the template was rendered."
options: options:
src: src:
description: description: