cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #12398 from donckers/stable-1.9

Browse source 
Stable 1.9 - Backport fix for #6653
This commit is contained in:
James Cammarata 2015-09-16 16:43:52 -04:00
commit 5d67420df0
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/utils/template.py
View file

@ -15,12 +15,14 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
import sys
import os import os
import re import re
import codecs import codecs
import jinja2 import jinja2
from jinja2.runtime import StrictUndefined from jinja2.runtime import StrictUndefined
from jinja2.exceptions import TemplateSyntaxError from jinja2.exceptions import TemplateSyntaxError
from jinja2.utils import missing
import yaml import yaml
import json import json
from ansible import errors from ansible import errors
@ -157,16 +159,23 @@ class _jinja2_vars(object):
extras is a list of locals to also search for variables. extras is a list of locals to also search for variables.
''' '''
def __init__(self, basedir, vars, globals, fail_on_undefined, *extras): def __init__(self, basedir, vars, globals, fail_on_undefined, locals=None, *extras):
self.basedir = basedir self.basedir = basedir
self.vars = vars self.vars = vars
self.globals = globals self.globals = globals
self.fail_on_undefined = fail_on_undefined self.fail_on_undefined = fail_on_undefined
self.extras = extras self.extras = extras
self.locals = dict()
if isinstance(locals, dict):
for key, val in locals.iteritems():
if key[:2] == 'l_' and val is not missing:
self.locals[key[2:]] = val
def __contains__(self, k): def __contains__(self, k):
if k in self.vars: if k in self.vars:
return True return True
if k in self.locals:
return True
for i in self.extras: for i in self.extras:
if k in i: if k in i:
return True return True
@ -177,6 +186,8 @@ class _jinja2_vars(object):
def __getitem__(self, varname): def __getitem__(self, varname):
from ansible.runner import HostVars from ansible.runner import HostVars
if varname not in self.vars: if varname not in self.vars:
if varname in self.locals:
return self.locals[varname]
for i in self.extras: for i in self.extras:
if varname in i: if varname in i:
return i[varname] return i[varname]
@ -200,7 +211,7 @@ class _jinja2_vars(object):
''' '''
if locals is None: if locals is None:
return self return self
return _jinja2_vars(self.basedir, self.vars, self.globals, self.fail_on_undefined, locals, *self.extras) return _jinja2_vars(self.basedir, self.vars, self.globals, self.fail_on_undefined, locals=locals, *self.extras)
class J2Template(jinja2.environment.Template): class J2Template(jinja2.environment.Template):
''' '''