read output of stringio if it is readable

This commit is contained in:
Daniel Wallace 2018-07-30 19:49:49 -05:00
parent 2e00939a6e
commit f9441d2bef
No known key found for this signature in database
GPG key ID: 5FA5E5544F010D48

View file

@ -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