No need for all the hoop-jumping

if a special structure is required for master, it'll use whatever's defined in pillar
saltstack-formulas · Oct 7, 2015 · 963f4f2 · 963f4f2
1 parent 8d09848
commit 963f4f2
Showing 1 changed file with 2 additions and 18 deletions.
diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf
@@ -19,26 +19,10 @@
 # minion includes
 {{ get_config('default_include', 'minion.d/*.conf') }}
 
-# master configs
-{%- if 'master' in cfg_minion -%}
-{%- if cfg_minion['master'] is not string %}
-master:
-  {% for name in cfg_minion['master'] -%}
-  - {{ name }}
-  {% endfor -%}
-{%- else %}
+# configure master
+{% if 'master' in cfg_minion -%}
 {{ get_config('master', 'salt') }}
 {%- 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
 {{ get_config('random_master', 'False') }}