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

Revert default value for ipv6 to None

Browse source
This commit is contained in:
Erik Johnson 2018-08-22 13:29:31 -05:00
parent 4634752b7e
commit bf5d907ce4
No known key found for this signature in database
GPG key ID: 5E5583C437808F3F
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/config/__init__.py
View file

@ -373,7 +373,7 @@ VALID_OPTS = {
'ipc_mode': six.string_types,
# Enable ipv6 support for daemons
'ipv6': bool,
'ipv6': (type(None), bool),
# The chunk size to use when streaming files with the file server
'file_buffer_size': int,
@ -1354,7 +1354,7 @@ DEFAULT_MINION_OPTS = {
'mine_interval': 60,
'ipc_mode': _DFLT_IPC_MODE,
'ipc_write_buffer': _DFLT_IPC_WBUFFER,
'ipv6': False,
'ipv6': None,
'file_buffer_size': 262144,
'tcp_pub_port': 4510,
'tcp_pull_port': 4511,
@ -1679,7 +1679,7 @@ DEFAULT_MASTER_OPTS = {
'enforce_mine_cache': False,
'ipc_mode': _DFLT_IPC_MODE,
'ipc_write_buffer': _DFLT_IPC_WBUFFER,
'ipv6': False,
'ipv6': None,
'tcp_master_pub_port': 4512,
'tcp_master_pull_port': 4513,
'tcp_master_publish_pull': 4514,