saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #277 from Furlot/patch-1

Browse Source 
Add http proxy support for minion
This commit is contained in:
Niels Abspoel 2017-01-22 23:45:25 +01:00 committed by GitHub
commit c685ca7767
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
salt/files/minion.d/f_defaults.conf
View File

@ -41,6 +41,32 @@ master:
{{ get_config('master', 'salt') }}
{%- endif %}
# Set http proxy information for the minion when doing requests
{% if 'proxy_host' in cfg_minion -%}
{%- do default_keys.append('proxy_host') %}
proxy_host: {{ cfg_minion['proxy_host'] }}
{% else -%}
#proxy_host:
{%- endif %}
{% if 'proxy_port' in cfg_minion -%}
{%- do default_keys.append('proxy_port') %}
proxy_port: {{ cfg_minion['proxy_port'] }}
{% else -%}
#proxy_port:
{%- endif %}
{% if 'proxy_username' in cfg_minion -%}
{%- do default_keys.append('proxy_username') %}
proxy_username: {{ cfg_minion['proxy_username'] }}
{% else -%}
#proxy_username:
{%- endif %}
{% if 'proxy_password' in cfg_minion -%}
{%- do default_keys.append('proxy_password') %}
proxy_password: {{ cfg_minion['proxy_password'] }}
{% else -%}
#proxy_password:
{%- endif %}
# If multiple masters are specified in the 'master' setting, the default behavior
# is to always try to connect to them in the order they are listed. If random_master is
# set to True, the order will be randomized instead. This can be helpful in distributing