Salt master mode's and salt-ssh mode's top.sls processing aren't the same

[edgan]

I am trying to use the delimiter option of grains.get. It works in salt master mode, but fails in salt-ssh mode. The reason I need the delimiter option is part of the grain path is the mac address of the instance, and it contains colons.

top.sls:

{% if salt['grains.get']('ec2|network|interfaces|macs|' ~ salt['grains.get']('ec2|mac', delimiter='|') ~ '|vpc_id', delimiter='|') == 'vpc-a3fbca73' %}

Error:

[ERROR   ] Rendering exception occurred: Jinja error: get() got an unexpected keyword argument 'delimiter'
Traceback (most recent call last):
  File "/usr/lib/python2.7/site-packages/salt/utils/templates.py", line 366, in render_jinja_tmpl
    output = template.render(**decoded_context)
  File "/usr/lib/python2.7/site-packages/jinja2/environment.py", line 989, in render
    return self.environment.handle_exception(exc_info, True)
  File "/usr/lib/python2.7/site-packages/jinja2/environment.py", line 754, in handle_exception
    reraise(exc_type, exc_value, tb)
  File "<template>", line 23, in top-level template code
TypeError: get() got an unexpected keyword argument 'delimiter'

[Ch3LL]

@edgan i am able to replicate this behavior just using that same jinja logic in a state file as well so I don't think its related to just the top file.

Running state.sls works just fine via a normal master/minion setup. But whne using salt-ssh I get the same error:

---
ch3ll-test2:
    - Rendering SLS 'base:issues.34345' failed: Jinja error: get() got an unexpected keyword argument 'delimiter'
      Traceback (most recent call last):
        File "/home/ch3ll/git/salt/salt/utils/templates.py", line 366, in render_jinja_tmpl
          output = template.render(**decoded_context)
        File "/usr/lib64/python2.7/site-packages/jinja2/environment.py", line 989, in render
          return self.environment.handle_exception(exc_info, True)
        File "/usr/lib64/python2.7/site-packages/jinja2/environment.py", line 754, in handle_exception
          reraise(exc_type, exc_value, tb)
        File "<template>", line 1, in top-level template code
      TypeError: get() got an unexpected keyword argument 'delimiter'

      ; line 1

      ---
      {% if salt['grains.get']('ec2|network|interfaces|macs|' ~ salt['grains.get']('ec2|mac', delimiter='|') ~ '|vpc_id', delimiter='|') == 'vpc-a3fbca73' %} {% endif %}    <======================

      Traceback (most recent call last):
        File "/home/ch3ll/git/salt/salt/utils/templates.py", line 366, in render_jinja_tmpl
          output = template.render(**decoded_context)
        File "/usr/lib64/python2.7/site-packages/jinja2/environment.py", line 989, in render
      [...]
      ---

Looks like we definitely need to get this fixed up.