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 #31029 from twangboy/win_defaults

Browse source 
Windows defaults to multiprocessing true
This commit is contained in:
Mike Place 2016-02-09 11:20:36 -07:00
commit 87f2816ef5
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/windows/buildenv/conf/minion
View file

@ -281,7 +281,7 @@ pki_dir: /conf/pki/minion
###########################################
# Disable multiprocessing support, by default when a minion receives a
# publication a new process is spawned and the command is executed therein.
multiprocessing: True
# multiprocessing: True
###### Logging settings #####
###########################################

4
salt/config.py
View file

@ -54,10 +54,8 @@ if salt.utils.is_windows():
# 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__),
@ -882,7 +880,7 @@ DEFAULT_MINION_OPTS = {
'open_mode': False,
'auto_accept': True,
'autosign_timeout': 120,
'multiprocessing': _DFLT_MULTIPROCESSING_MODE,
'multiprocessing': True,
'mine_interval': 60,
'ipc_mode': _DFLT_IPC_MODE,
'ipv6': False,