Browse Source

proxy_minion fix

Change-Id: Ie6cf0a8361524b594b60119b25f6d336b6797ece
meta
Jiri Broulik 7 years ago
parent
commit
5ebdfcebfd
3 changed files with 5 additions and 5 deletions
  1. +1
    -1
      salt/files/proxy.conf
  2. +1
    -1
      salt/minion/init.sls
  3. +3
    -3
      salt/minion/proxy.sls

+ 1
- 1
salt/files/proxy.conf View File

# This configuration file is used to manage the behavior of all Salt Proxy # This configuration file is used to manage the behavior of all Salt Proxy
# Minions on this host. # Minions on this host.


master: {{ proxy.master|default('localhost') }}
master: {{ proxy_minion.master|default('localhost') }}
multiprocessing: False multiprocessing: False
mine_enabled: True mine_enabled: True

+ 1
- 1
salt/minion/init.sls View File

- salt.minion.ca - salt.minion.ca
{%- endif %} {%- endif %}
- salt.minion.cert - salt.minion.cert
{%- if pillar.salt.minion.proxy is defined %}
{%- if pillar.salt.minion.proxy_minion is defined %}
- salt.minion.proxy - salt.minion.proxy
{%- endif %} {%- endif %}

+ 3
- 3
salt/minion/proxy.sls View File

- template: jinja - template: jinja
- defaults: - defaults:
napalm: {{ napalm }} napalm: {{ napalm }}
proxy: {{ proxy|yaml }}
proxy_minion: {{ proxy_minion|yaml }}


{%- if napalm %} {%- if napalm %}


network_proxy_packages: network_proxy_packages:
pkg.installed: pkg.installed:
- names: {{ proxy.napalm_pkgs }}
- names: {{ proxy_minion.napalm_pkgs }}


napalm: napalm:
pip.installed: pip.installed:
- name: {{ proxy.napalm_pip_pkgs}}
- name: {{ proxy_minion.napalm_pip_pkgs}}
- require: - require:
- pkg: python-pip - pkg: python-pip



Loading…
Cancel
Save