proxy_minion fix

Change-Id: I73a4a14734651f6483fae169a2290e9c5b377d76

README.rst

@@ -219,7 +219,7 @@ Salt proxy pillar
 
     salt:
       minion:
-        proxy:
+        proxy_minion:
           master: localhost
           device:
             vsrx01.mydomain.local:

salt/map.jinja

@@ -113,8 +113,8 @@ RedHat:
 {%- set raw_minion = salt['grains.filter_by'](minion_specific, merge=salt['pillar.get']('salt:minion')) %}
 {%- set minion = salt['grains.filter_by'](minion_common, merge=raw_minion) %}
 
-{%- if pillar.salt.minion.proxy is defined %}
-{% set proxy = salt['grains.filter_by']({
+{%- if pillar.salt.minion.proxy_minion is defined %}
+{% set proxy_minion = salt['grains.filter_by']({
     'Debian': {
         'napalm_pkgs': ['python-pip', 'libxml2-dev', 'libxslt1-dev', 'zlib1g-dev'],
         'napalm_pip_pkgs': ['napalm', 'oauth']
@@ -122,7 +122,7 @@ RedHat:
     'RedHat': {
         'napalm_pkgs': ['libxml2-dev', 'libxslt1-dev', 'zlib1g-dev']
     },
-}, merge=pillar.salt.minion.get('proxy', {})) %}
+}, merge=pillar.salt.minion.get('proxy_minion', {})) %}
 {%- endif %}
 
 {%- endif %}

salt/minion/proxy.sls

@@ -1,8 +1,8 @@
-{%- from "salt/map.jinja" import proxy with context %}
+{%- from "salt/map.jinja" import proxy_minion with context %}
 
 {%- set napalm = false %}
 
-{%- for proxy_name, proxy_device in proxy.get('device', {}).iteritems() %}
+{%- for proxy_name, proxy_device in proxy_minion.get('device', {}).iteritems() %}
 
 {%- if proxy_device.engine == 'napalm' %}
 
@@ -39,7 +39,7 @@ napalm:
 
 {%- endif %}
 
-{%- for proxy_name, proxy_device in proxy.get('device', {}).iteritems() %}
+{%- for proxy_name, proxy_device in proxy_minion.get('device', {}).iteritems() %}
 
 salt_proxy_{{ proxy_name }}_service:
   service.running:

tests/pillar/minion_proxy.sls

@@ -1,7 +1,7 @@
 salt:
   minion:
     enabled: true
-    proxy:
+    proxy_minion:
       master: localhost
       device:
         vsrx01.mydomain.local: