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

Eliminate warning when 'ssl' not set (#37849)

Browse source 
When not specifying 'ssl' in a config file, the following warning
is displayed:

`[WARNING ] Key 'ssl' with value None has an invalid type of NoneType,
a dict is required for this value`

This has been caused by PR #37776.

Fix this by allowing `None` as a valid value for `ssl`.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
This commit is contained in:
Sergey Kizunov 2016-11-23 11:40:28 -05:00 • committed by Nicole Thomas
parent 0c607ccaec
commit 16ce844c54
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/config/__init__.py
View file

@ -921,7 +921,7 @@ VALID_OPTS = {
# http://docs.python.org/2/library/ssl.html#ssl.wrap_socket
# Note: to set enum arguments values like `cert_reqs` and `ssl_version` use constant names
# without ssl module prefix: `CERT_REQUIRED` or `PROTOCOL_SSLv23`.
'ssl': dict,
'ssl': (dict, type(None)),
}
# default configurations