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

Merge pull request #37919 from rallytime/merge-develop

Browse Source 
[develop] Merge forward from 2016.11 to develop
This commit is contained in:
Nicole Thomas 2016-11-28 12:05:39 -07:00 committed by GitHub
commit 6fd6c3516a
4 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
conf/master
View File

@ -382,6 +382,15 @@
# will cause minion to throw an exception and drop the message.
# sign_pub_messages: False
# Use TLS/SSL encrypted connection between master and minion.
# Can be set to a dictionary containing keyword arguments corresponding to Python's
# 'ssl.wrap_socket' method.
# Default is None.
#ssl:
# keyfile: <path_to_keyfile>
# certfile: <path_to_certfile>
# ssl_version: PROTOCOL_TLSv1_2
##### Salt-SSH Configuration #####
##########################################

9
conf/minion
View File

@ -633,6 +633,15 @@
# "salt-key -f master.pub" on the Salt master.
#master_finger: ''
# Use TLS/SSL encrypted connection between master and minion.
# Can be set to a dictionary containing keyword arguments corresponding to Python's
# 'ssl.wrap_socket' method.
# Default is None.
#ssl:
# keyfile: <path_to_keyfile>
# certfile: <path_to_certfile>
# ssl_version: PROTOCOL_TLSv1_2
###### Thread settings #####
###########################################

7
doc/ref/configuration/minion.rst
View File

@ -107,13 +107,14 @@ to manage the minion's master setting from an execution module. By simply
changing the algorithm in the module to return a new master ip/fqdn, restart
the minion and it will connect to the new master.
As of version 2016.11.0 this option can be set to ``disable`` and the minion
will never attempt to talk to the master. This is useful for running a
masterless minion daemon.
.. code-block:: yaml
master_type: disable
If you just want to run a masterless minion, this can be set and the minion
will never attempt to talk to the master.
.. conf_minion:: max_event_size
``max_event_size``

24
salt/utils/thin.py
View File

@ -19,7 +19,7 @@ import subprocess
import jinja2
import yaml
import msgpack
import salt.ext.six as six
import salt.ext.six as _six
import tornado
# pylint: disable=import-error,no-name-in-module
@ -107,7 +107,7 @@ def get_tops(extra_mods='', so_mods=''):
os.path.dirname(msgpack.__file__),
]
tops.append(six.__file__.replace('.pyc', '.py'))
tops.append(_six.__file__.replace('.pyc', '.py'))
if HAS_CERTIFI:
tops.append(os.path.dirname(certifi.__file__))
@ -196,7 +196,7 @@ def gen_thin(cachedir, extra_mods='', overwrite=False, so_mods='',
pass
else:
return thintar
if six.PY3:
if _six.PY3:
# Let's check for the minimum python 2 version requirement, 2.6
py_shell_cmd = (
python2_bin + ' -c \'from __future__ import print_function; import sys; '
@ -222,14 +222,14 @@ def gen_thin(cachedir, extra_mods='', overwrite=False, so_mods='',
tops_py_version_mapping = {}
tops = get_tops(extra_mods=extra_mods, so_mods=so_mods)
if six.PY2:
if _six.PY2:
tops_py_version_mapping['2'] = tops
else:
tops_py_version_mapping['3'] = tops
# TODO: Consider putting known py2 and py3 compatible libs in it's own sharable directory.
# This would reduce the thin size.
if six.PY2 and sys.version_info[0] == 2:
if _six.PY2 and sys.version_info[0] == 2:
# Get python 3 tops
py_shell_cmd = (
python3_bin + ' -c \'import sys; import json; import salt.utils.thin; '
@ -244,7 +244,7 @@ def gen_thin(cachedir, extra_mods='', overwrite=False, so_mods='',
tops_py_version_mapping['3'] = tops
except ValueError:
pass
if six.PY3 and sys.version_info[0] == 3:
if _six.PY3 and sys.version_info[0] == 3:
# Get python 2 tops
py_shell_cmd = (
python2_bin + ' -c \'from __future__ import print_function; '
@ -267,7 +267,7 @@ def gen_thin(cachedir, extra_mods='', overwrite=False, so_mods='',
except OSError:
start_dir = None
tempdir = None
for py_ver, tops in six.iteritems(tops_py_version_mapping):
for py_ver, tops in _six.iteritems(tops_py_version_mapping):
for top in tops:
if not os.path.isabs(top):
continue
@ -361,7 +361,7 @@ def gen_min(cachedir, extra_mods='', overwrite=False, so_mods='',
pass
else:
return mintar
if six.PY3:
if _six.PY3:
# Let's check for the minimum python 2 version requirement, 2.6
py_shell_cmd = (
python2_bin + ' -c \'from __future__ import print_function; import sys; '
@ -387,14 +387,14 @@ def gen_min(cachedir, extra_mods='', overwrite=False, so_mods='',
tops_py_version_mapping = {}
tops = get_tops(extra_mods=extra_mods, so_mods=so_mods)
if six.PY2:
if _six.PY2:
tops_py_version_mapping['2'] = tops
else:
tops_py_version_mapping['3'] = tops
# TODO: Consider putting known py2 and py3 compatible libs in it's own sharable directory.
# This would reduce the min size.
if six.PY2 and sys.version_info[0] == 2:
if _six.PY2 and sys.version_info[0] == 2:
# Get python 3 tops
py_shell_cmd = (
python3_bin + ' -c \'import sys; import json; import salt.utils.thin; '
@ -409,7 +409,7 @@ def gen_min(cachedir, extra_mods='', overwrite=False, so_mods='',
tops_py_version_mapping['3'] = tops
except ValueError:
pass
if six.PY3 and sys.version_info[0] == 3:
if _six.PY3 and sys.version_info[0] == 3:
# Get python 2 tops
py_shell_cmd = (
python2_bin + ' -c \'from __future__ import print_function; '
@ -550,7 +550,7 @@ def gen_min(cachedir, extra_mods='', overwrite=False, so_mods='',
'salt/output/nested.py',
)
for py_ver, tops in six.iteritems(tops_py_version_mapping):
for py_ver, tops in _six.iteritems(tops_py_version_mapping):
for top in tops:
base = os.path.basename(top)
top_dirname = os.path.dirname(top)