Merge "Allow setting more master and minion options"

salt/files/master.conf

@@ -4,6 +4,10 @@
 worker_threads: {{ master.worker_threads }}
 timeout: {{ master.command_timeout }}
 
+{%- if master.get('max_open_files') %}
+max_open_files: {{ master.max_open_files }}
+{%- endif %}
+
 state_output: {{ master.get('state_output', 'changes') }}
 
 {%- if master.system is defined %}
@@ -90,3 +94,7 @@ logstash_zmq_handler:
 {%- if master.get('order_masters', False) %}
 order_masters: True
 {%- endif %}
+
+{#-
+vim: syntax=jinja
+-#}

salt/files/minion.conf

@@ -23,9 +23,13 @@ master: {{ minion.master.host }}
 
 id: {{ system.name }}.{{ system.domain }}
 
-{% if minion.get('max_event_size') %}
-max_event_size: {{ minion.max_event_size }}
+{%- for opt in ['max_event_size', 'acceptance_wait_time_max',
+  'acceptance_wait_time', 'random_reauth_delay', 'recon_default', 'recon_max',
+  'recon_randomize', 'auth_timeout'] %}
+{% if minion.get(opt) %}
+{{ opt }}: {{ minion.get(opt) }}
 {%- endif %}
+{%- endfor %}
 
 {%- set excluded_keys = ('master', 'system', 'public_keys', 'private_keys', 'known_hosts', '__reclass__', '_secret', '_param') %}
 
@@ -163,3 +167,7 @@ logstash_zmq_handler:
 {%- endif %}
 
 {%- endfor %}
+
+{#-
+vim: syntax=jinja
+-#}