Merge pull request #451 from sticky-note/fix/tpl_path

fix(tpl_path): salt master conf files

salt/cloud.sls

+{%- set tplroot = tpldir.split('/')[0] %}
 {% from "salt/map.jinja" import salt_settings with context %}
 
 {%- if salt_settings.use_pip %}
 cloud-cert-{{ cert }}-pem:
   file.managed:
     - name: {{ salt_settings.config_path }}/pki/cloud/{{ cert }}.pem
-    - source: salt://{{ slspath }}/files/key
+    - source: salt://{{ tplroot }}/files/key
     - template: jinja
     - user: root
     - group:

salt/master.sls

               }}
     {%- else %}
     - template: jinja
-    - source: salt://{{ slspath }}/files/master.d
+    - source: salt://{{ tplroot }}/files/master.d
     {%- endif %}
     - clean: {{ salt_settings.clean_config_d_dir }}
     - exclude_pat: _*

salt/minion.sls

               }}
     {%- else %}
     - template: jinja
-    - source: salt://{{ slspath }}/files/minion.d
+    - source: salt://{{ tplroot }}/files/minion.d
     - context:
         standalone: False
     {%- endif %}

salt/ssh.sls

+{%- set tplroot = tpldir.split('/')[0] %}
 {% from "salt/map.jinja" import salt_settings with context %}
 
 {% if salt_settings.install_packages %}
 ensure-roster-config:
   file.managed:
     - name: {{ salt_settings.config_path }}/roster
-    - source: salt://{{ slspath }}/files/roster.jinja
+    - source: salt://{{ tplroot }}/files/roster.jinja
     - template: jinja
 {% if salt_settings.install_packages %}
     - require:

salt/standalone.sls

+{%- set tplroot = tpldir.split('/')[0] %}
 {% from "salt/map.jinja" import salt_settings with context %}
 
 salt-minion:
   file.recurse:
     - name: {{ salt_settings.config_path }}/minion.d
     - template: jinja
-    - source: salt://{{ slspath }}/files/minion.d
+    - source: salt://{{ tplroot }}/files/minion.d
     - clean: {{ salt_settings.clean_config_d_dir }}
     - exclude_pat: _*
     - context: