Bläddra i källkod

enable put salt minion proxy host to empty string

When proxy parameter was defined and host is empty string, salt is complaining with warning. With this patch when host is empty parameters are not used.

Change-Id: I11150e5f141182d5934564611d6c39b2b379b5e9
pull/73/head
Ondrej Smola 6 år sedan
förälder
incheckning
44358fe688
1 ändrade filer med 1 tillägg och 1 borttagningar
  1. +1
    -1
      salt/files/minion.conf

+ 1
- 1
salt/files/minion.conf Visa fil

log_level: {{ minion.log.get('level', 'error') }} log_level: {{ minion.log.get('level', 'error') }}
state_output: {{ minion.log.get('state_output', 'changes') }} state_output: {{ minion.log.get('state_output', 'changes') }}


{%- if minion.proxy is defined %}
{%- if minion.get('proxy', {}).get('host', "") != "" %}
proxy_host: {{ minion.proxy.host }} proxy_host: {{ minion.proxy.host }}
proxy_port: {{ minion.proxy.port }} proxy_port: {{ minion.proxy.port }}
{%- endif %} {%- endif %}

Laddar…
Avbryt
Spara