mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
read output of stringio if it is readable
This commit is contained in:
parent
2e00939a6e
commit
f9441d2bef
1 changed files with 9 additions and 7 deletions
|
@ -127,10 +127,12 @@ def renderer(path=None, string=None, default_renderer='jinja|yaml', **kwargs):
|
|||
path_or_string = ':string:'
|
||||
kwargs['input_data'] = string
|
||||
|
||||
return salt.template.compile_template(
|
||||
path_or_string,
|
||||
renderers,
|
||||
default_renderer,
|
||||
__opts__['renderer_blacklist'],
|
||||
__opts__['renderer_whitelist'],
|
||||
**kwargs)
|
||||
ret = salt.template.compile_template(
|
||||
path_or_string,
|
||||
renderers,
|
||||
default_renderer,
|
||||
__opts__['renderer_blacklist'],
|
||||
__opts__['renderer_whitelist'],
|
||||
**kwargs
|
||||
)
|
||||
return ret.read() if __utils__['stringio.is_readable'](ret) else ret
|
||||
|
|
Loading…
Add table
Reference in a new issue