Skip to content

Commit

Permalink
Merge pull request #55723 from max-arnold/renderer-saltenv
Browse files Browse the repository at this point in the history
[master] Port #52293 (saltenv support in slsutil.renderer)
  • Loading branch information
dwoz authored Dec 23, 2019
2 parents 625deac + f6187a2 commit b6a4e91
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion salt/modules/slsutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def run():
renderers = salt.loader.render(__opts__, __salt__)

if path:
path_or_string = __salt__['cp.get_url'](path)
path_or_string = __salt__['cp.get_url'](path, saltenv=kwargs.get('saltenv', 'base'))
elif string:
path_or_string = ':string:'
kwargs['input_data'] = string
Expand Down

0 comments on commit b6a4e91

Please sign in to comment.