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

Template role_params to avoid merging dict and unicode

Browse source 
This fixes #12915

Since combine_vars() is being run directly on role_params, we have to avoid merge_hash() to complain about merging a dict with a string (jinja template).
This commit is contained in:
Dag Wieers 2016-02-18 18:04:28 +01:00
parent ab0904d051
commit fb442206ca
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/ansible/runner/__init__.py
View file

@ -647,7 +647,8 @@ class Runner(object):
# vars_files which had host-specific templating done)
inject = utils.combine_vars(inject, self.vars_cache.get(host, {}))
# role parameters next
inject = utils.combine_vars(inject, self.role_params)
role_params = template.template(self.basedir, self.role_params, inject)
inject = utils.combine_vars(inject, role_params)
# and finally -e vars are the highest priority
inject = utils.combine_vars(inject, self.extra_vars)
# and then special vars