mirror of
https://github.com/valitydev/salt.git
synced 2024-11-09 01:36:48 +00:00
Merge pull request #49976 from rallytime/bp-49966
Back-port #49966 to fluorine
This commit is contained in:
commit
10d9925c79
@ -333,7 +333,7 @@ def playbooks(playbook, rundir=None, check=False, diff=False, extra_vars=None,
|
||||
if diff:
|
||||
command.append('--diff')
|
||||
if isinstance(extra_vars, dict):
|
||||
command.append('--extra-vars={0}'.format(json.dumps(extra_vars)))
|
||||
command.append("--extra-vars='{0}'".format(json.dumps(extra_vars)))
|
||||
elif isinstance(extra_vars, six.text_type) and extra_vars.startswith('@'):
|
||||
command.append('--extra-vars={0}'.format(extra_vars))
|
||||
if flush_cache:
|
||||
|
Loading…
Reference in New Issue
Block a user