Merge "proxy_minion fix"

salt/files/proxy.conf

@@ -3,6 +3,6 @@
 # This configuration file is used to manage the behavior of all Salt Proxy
 # Minions on this host.
 
-master: {{ proxy.master|default('localhost') }}
+master: {{ proxy_minion.master|default('localhost') }}
 multiprocessing: False
 mine_enabled: True

salt/minion/init.sls

@@ -8,6 +8,6 @@ include:
 - salt.minion.ca
 {%- endif %}
 - salt.minion.cert
-{%- if pillar.salt.minion.proxy is defined %}
+{%- if pillar.salt.minion.proxy_minion is defined %}
 - salt.minion.proxy
 {%- endif %}

salt/minion/proxy.sls

@@ -23,17 +23,17 @@
   - template: jinja
   - defaults:
       napalm: {{ napalm }}
-      proxy: {{ proxy|yaml }}
+      proxy_minion: {{ proxy_minion|yaml }}
 
 {%- if napalm %}
 
 network_proxy_packages:
   pkg.installed:
-  - names: {{ proxy.napalm_pkgs }}
+  - names: {{ proxy_minion.napalm_pkgs }}
 
 napalm:
   pip.installed:
-    - name: {{ proxy.napalm_pip_pkgs}}
+    - name: {{ proxy_minion.napalm_pip_pkgs}}
     - require:
       - pkg: python-pip