proxy_minion fix
Change-Id: Ie6cf0a8361524b594b60119b25f6d336b6797ece
diff --git a/salt/files/proxy.conf b/salt/files/proxy.conf
index b143f85..997b2b0 100644
--- a/salt/files/proxy.conf
+++ b/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
diff --git a/salt/minion/init.sls b/salt/minion/init.sls
index 7d38076..3439ce1 100644
--- a/salt/minion/init.sls
+++ b/salt/minion/init.sls
@@ -8,6 +8,6 @@
- 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 %}
diff --git a/salt/minion/proxy.sls b/salt/minion/proxy.sls
index d1a2f63..5d14aff 100644
--- a/salt/minion/proxy.sls
+++ b/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