saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24791 from rallytime/bp-24749

Browse source 
Back-port #24749 to 2015.5
This commit is contained in:
Mike Place 2015-06-18 11:43:15 -06:00
commit 7073a9f850
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
salt/config.py
View file

@ -46,6 +46,16 @@ _DFLT_LOG_FMT_LOGFILE = (
'%(asctime)s,%(msecs)03.0f [%(name)-17s][%(levelname)-8s][%(process)d] %(message)s'
)
if salt.utils.is_windows():
# Since an 'ipc_mode' of 'ipc' will never work on Windows due to lack of
# support in ZeroMQ, we want the default to be something that has a
# chance of working.
_DFLT_IPC_MODE = 'tcp'
_DFLT_MULTIPROCESSING_MODE = False
else:
_DFLT_IPC_MODE = 'ipc'
_DFLT_MULTIPROCESSING_MODE = True
FLO_DIR = os.path.join(
os.path.dirname(__file__),
'daemons', 'flo')
@ -359,7 +369,7 @@ DEFAULT_MINION_OPTS = {
'open_mode': False,
'auto_accept': True,
'autosign_timeout': 120,
'multiprocessing': True,
'multiprocessing': _DFLT_MULTIPROCESSING_MODE,
'mine_interval': 60,
'ipc_mode': 'ipc',
'ipv6': False,