valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added 'raet_join_fresh' to opts

Browse Source 
If TRUE when RoadStack starts up it blows away persisted remotes
If FALSE then it uses its persited remotes

On a minion this means that if TRUE it will use the opt 'master' to determine which masters
to join to Otherwise it will join to preexiting masters it joined to last time it ran.

On a master this means that if TRUE it forgets all the minions and they must rejoin
If FALSE it will start using presence on all preexisting minions
This commit is contained in:
Samuel M Smith 2014-10-23 17:55:07 -06:00
parent 3cf05c1fe3
commit f1f580ad08
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/config.py
View File

@ -252,6 +252,7 @@ VALID_OPTS = {
'raet_port': int,
'raet_mutable': bool,
'raet_main': bool,
'raet_join_fresh': bool,
'sqlite_queue_dir': str,
'queue_dirs': list,
'ping_interval': int,
@ -404,6 +405,7 @@ DEFAULT_MINION_OPTS = {
'raet_port': 4510,
'raet_mutable': False,
'raet_main': False,
'raet_join_fresh': True,
'restart_on_error': False,
'ping_interval': 0,
'username': None,
@ -570,6 +572,7 @@ DEFAULT_MASTER_OPTS = {
'raet_port': 4506,
'raet_mutable': False,
'raet_main': True,
'raet_join_fresh': False,
'sqlite_queue_dir': os.path.join(salt.syspaths.CACHE_DIR, 'master', 'queues'),
'queue_dirs': [],
'cli_summary': False,