| commit | 9e4dd699e9974d1337680824b4bdb2a6b313f73b | [log] [tgz] |
|---|---|---|
| author | Petr Michalec <pmichalec@mirantis.com> | Fri Sep 21 07:59:39 2018 +0000 |
| committer | Gerrit Code Review <gerrit2@84b5d06f6116> | Fri Sep 21 07:59:39 2018 +0000 |
| tree | 375112f4ffb0283f8f4e1edac3a39d588b44c140 | |
| parent | f625f8f1e0b3bbfcd6d503f9c2fd74b69f4f8550 [diff] | |
| parent | b223a2e6e93bb86cf42bef77d131dec85bd5b04e [diff] |
Merge "minion.conf: Accept tcp_keepalive* properties"
diff --git a/salt/files/minion.conf b/salt/files/minion.conf index 87bb5b4..a9c19c6 100644 --- a/salt/files/minion.conf +++ b/salt/files/minion.conf
@@ -26,7 +26,11 @@ 'max_event_size', 'random_reauth_delay', 'recon_default', - 'recon_max' + 'recon_max', + 'tcp_keepalive', + 'tcp_keepalive_cnt', + 'tcp_keepalive_idle', + 'tcp_keepalive_intvl' ] %} {%- for opt in opt_list %} {%- if minion.get(opt) %}