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

Use split_args instead of shlex to split include params

Browse source 
Fixes #8947
This commit is contained in:
James Cammarata 2014-09-23 16:12:01 -05:00
parent 4e9c061b35
commit c4f1785217
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/playbook/__init__.py
View file

@ -21,6 +21,7 @@ import ansible.runner
from ansible.utils.template import template from ansible.utils.template import template
from ansible import utils from ansible import utils
from ansible import errors from ansible import errors
from ansible.module_utils.splitter import split_args, unquote
import ansible.callbacks import ansible.callbacks
import ansible.cache import ansible.cache
import os import os
@ -209,12 +210,15 @@ class PlayBook(object):
name and returns the merged vars along with the path name and returns the merged vars along with the path
''' '''
new_vars = existing_vars.copy() new_vars = existing_vars.copy()
tokens = shlex.split(play_ds.get('include', '')) tokens = split_args(play_ds.get('include', ''))
for t in tokens[1:]: for t in tokens[1:]:
(k,v) = t.split("=", 1) try:
new_vars[k] = template(basedir, v, new_vars) (k,v) = unquote(t).split("=", 1)
new_vars[k] = template(basedir, v, new_vars)
except ValueError, e:
raise errors.AnsibleError('included playbook variables must be in the form k=v, got: %s' % t)
return (new_vars, tokens[0]) return (new_vars, unquote(tokens[0]))
# ***************************************************** # *****************************************************