Skip to content

Commit

Permalink
Add default values for new minion config options
Browse files Browse the repository at this point in the history
  • Loading branch information
terminalmage committed Sep 21, 2015
1 parent 453b883 commit 540a7df
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions salt/config.py
Expand Up @@ -150,6 +150,8 @@
'recon_max': float,
'recon_default': float,
'recon_randomize': float,
'return_retry_timer': int,
'return_retry_random': bool,
'event_return': str,
'event_return_queue': int,
'event_return_whitelist': list,
Expand Down Expand Up @@ -413,6 +415,8 @@
'recon_max': 10000,
'recon_default': 1000,
'recon_randomize': True,
'return_retry_timer': 4,
'return_retry_random': True,
'syndic_log_file': os.path.join(salt.syspaths.LOGS_DIR, 'syndic'),
'syndic_pidfile': os.path.join(salt.syspaths.PIDFILE_DIR, 'salt-syndic.pid'),
'random_reauth_delay': 10,
Expand Down

0 comments on commit 540a7df

Please sign in to comment.