fix(map.jinja): use pillar.get for salt-ssh

Author: myii

template/map.jinja

@@ -1,17 +1,41 @@
 # -*- coding: utf-8 -*-
 # vim: ft=jinja
 
+{#- Determine the type of command being run
+    * min: standard call via. master
+    * cll: `salt-call`
+    * ssh: `salt-ssh`
+    * unk: unknown call #}
+{%- if salt['config.get']('__cli') == 'salt-minion' %}
+{%-   set cli = 'min' %}
+{%- elif salt['config.get']('__cli') == 'salt-call' %}
+{%-   if salt['config.get']('root_dir') == '/' %}
+{%-     set cli = 'cll' %}
+{%-   else %}
+{%-     set cli = 'ssh' %}
+{%-   endif %}
+{%- else %}
+{%-   set cli = 'unk' %}
+{%- endif %}
+
 {#- Get the `tplroot` from `tpldir` #}
 {%- set tplroot = tpldir.split('/')[0] %}
 {#- Start imports as #}
 {%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
 {%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}
 {%- import_yaml tplroot ~ "/osmap.yaml" as osmap %}
 {%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %}
-{%- set _lookup = salt['config.get']('template:lookup', default={}) %}
-{%- set _config = salt['config.get']('template', default={}) %}
 
-{%- set template = salt['grains.filter_by'](default_settings, default='template',
+{#- Get lookup and config/pillar depending on type of command being run #}
+{%- if cli == 'min' or cli == 'cll' %}
+{%-   set _lookup = salt['config.get'](tplroot ~ ':lookup', default={}, merge='recurse') or {} %}
+{%-   set _config = salt['config.get'](tplroot, default={}, merge='recurse') or {} %}
+{%- else %}
+{%-   set _lookup = salt['pillar.get'](tplroot ~ ':lookup', default={}, merge=True) or {} %}
+{%-   set _config = salt['pillar.get'](tplroot, default={}, merge=True) or {} %}
+{%- endif %}
+
+{%- set template = salt['grains.filter_by'](default_settings, default=tplroot,
     merge=salt['grains.filter_by'](osfamilymap, grain='os_family',
       merge=salt['grains.filter_by'](osmap, grain='os',
         merge=salt['grains.filter_by'](osfingermap, grain='osfinger',