Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Merge pull request #179 from blast-hardcheese/bugfix/178_master-configs-in-minion 

Never fall back to `cfg_salt['master']` in minion config
This commit is contained in:
Forrest 2015-11-15 12:19:51 -08:00
parent eeb7235ee0 d730d4f2b8
commit 5c960fd2d8
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -20,8 +20,7 @@
{{ get_config('default_include', 'minion.d/*.conf') }} {{ get_config('default_include', 'minion.d/*.conf') }}
# master configs # master configs
{%- if 'master' in cfg_minion -%} {%- if 'master' in cfg_minion and cfg_minion['master'] is not string %}
{%- if cfg_minion['master'] is not string %}
master: master:
{% for name in cfg_minion['master'] -%} {% for name in cfg_minion['master'] -%}
- {{ name }} - {{ name }}
@ -29,16 +28,6 @@ master:
{%- else %} {%- else %}
{{ get_config('master', 'salt') }} {{ get_config('master', 'salt') }}
{%- endif %} {%- endif %}
{% elif 'master' in cfg_salt -%}
{%- if cfg_salt['master'] is not string %}
master:
{% for name in cfg_salt['master'] -%}
- {{ name }}
{% endfor -%}
{%- else %}
{{ get_config('master', 'salt') }}
{%- endif -%}
{%- endif %}
# choose a random master # choose a random master
{{ get_config('random_master', 'False') }} {{ get_config('random_master', 'False') }}