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

Merge branch '2016.3' into 'develop'

Browse Source 
No conflicts.
This commit is contained in:
rallytime 2016-07-19 10:31:07 -06:00
commit 39bc093ee9
22 changed files with 5747 additions and 1731 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/man/salt-api.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-API" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-API" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-api \- salt-api Command
.

6
doc/man/salt-call.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CALL" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-CALL" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-call \- salt-call Documentation
.
@ -168,7 +168,7 @@ Logging options which override any settings defined on the configuration files.
.B \-l LOG_LEVEL, \-\-log\-level=LOG_LEVEL
Console logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
\fBdebug\fP, \fBinfo\fP, \fBwarning\fP, \fBerror\fP, \fBquiet\fP\&. Default:
\fBinfo\fP\&.
\fBwarning\fP\&.
.UNINDENT
.INDENT 0.0
.TP
@ -180,7 +180,7 @@ Log file path. Default: /var/log/salt/minion\&.
.B \-\-log\-file\-level=LOG_LEVEL_LOGFILE
Logfile logging log level. One of \fBall\fP, \fBgarbage\fP, \fBtrace\fP,
\fBdebug\fP, \fBinfo\fP, \fBwarning\fP, \fBerror\fP, \fBquiet\fP\&. Default:
\fBinfo\fP\&.
\fBwarning\fP\&.
.UNINDENT
.SS Output Options
.INDENT 0.0

2
doc/man/salt-cloud.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CLOUD" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-CLOUD" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-cloud \- Salt Cloud Command
.

2
doc/man/salt-cp.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-CP" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-CP" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-cp \- salt-cp Documentation
.

2
doc/man/salt-key.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-KEY" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-KEY" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-key \- salt-key Documentation
.

2
doc/man/salt-master.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MASTER" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-MASTER" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-master \- salt-master Documentation
.

2
doc/man/salt-minion.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-MINION" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-MINION" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-minion \- salt-minion Documentation
.

2
doc/man/salt-proxy.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-PROXY" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-PROXY" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-proxy \- salt-proxy Documentation
.

2
doc/man/salt-run.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-RUN" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-RUN" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-run \- salt-run Documentation
.

2
doc/man/salt-ssh.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SSH" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-SSH" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-ssh \- salt-ssh Documentation
.

2
doc/man/salt-syndic.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-SYNDIC" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-SYNDIC" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-syndic \- salt-syndic Documentation
.

2
doc/man/salt-unity.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT-UNITY" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT-UNITY" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt-unity \- salt-unity Command
.

2
doc/man/salt.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SALT" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SALT" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
salt \- salt
.

7374
doc/man/salt.7
View File

File diff suppressed because it is too large Load Diff

2
doc/man/spm.1
View File

@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
.TH "SPM" "1" "May 17, 2016" "2016.3.0" "Salt"
.TH "SPM" "1" "July 18, 2016" "2016.3.1" "Salt"
.SH NAME
spm \- Salt Package Manager Command
.

2
doc/topics/cloud/azure.rst
View File

@ -14,7 +14,7 @@ More information about Azure is located at `http://www.windowsazure.com/
Dependencies
============
* The `Azure <https://pypi.python.org/pypi/azure>`_ Python SDK >= 0.10.2 and < 1.0.0
* `Microsoft Azure SDK for Python <https://pypi.python.org/pypi/azure/1.0.2>`_ >= 1.0.2
* The python-requests library, for Python < 2.7.9.
* A Microsoft Azure account
* OpenSSL (to generate the certificates)

1
doc/topics/using_salt.rst
View File

@ -15,6 +15,7 @@ This section describes the fundamental components and concepts that you need to
engines/index
yaml/index
jinja/index
tutorials/index
troubleshooting/index
../faq
best_practices

60
salt/modules/ldap3.py
View File

@ -231,6 +231,18 @@ def connect(connect_spec=None):
This object should be used as a context manager. It is safe
to nest ``with`` statements.
CLI example:
.. code-block:: bash
salt '*' ldap3.connect "{
'url': 'ldaps://ldap.example.com/',
'bind': {
'method': 'simple',
'dn': 'cn=admin,dc=example,dc=com',
'password': 'secret'}
}"
'''
if isinstance(connect_spec, _connect_ctx):
return connect_spec
@ -357,6 +369,18 @@ def add(connect_spec, dn, attributes):
:returns:
``True`` if successful, raises an exception otherwise.
CLI example:
.. code-block:: bash
salt '*' ldap3.add "{
'url': 'ldaps://ldap.example.com/',
'bind': {
'method': 'simple',
'password': 'secret',
},
}" "dn='dc=example,dc=com'" "attributes={'example': 'values'}"
'''
l = connect(connect_spec)
# convert the "iterable of values" to lists in case that's what
@ -386,6 +410,17 @@ def delete(connect_spec, dn):
:returns:
``True`` if successful, raises an exception otherwise.
CLI example:
.. code-block:: bash
salt '*' ldap3.delete "{
'url': 'ldaps://ldap.example.com/',
'bind': {
'method': 'simple',
'password': 'secret'}
}" dn='cn=admin,dc=example,dc=com'
'''
l = connect(connect_spec)
log.info('deleting entry: dn: {0}'.format(repr(dn)))
@ -430,6 +465,18 @@ def modify(connect_spec, dn, directives):
:returns:
``True`` if successful, raises an exception otherwise.
CLI example:
.. code-block:: bash
salt '*' ldap3.modify "{
'url': 'ldaps://ldap.example.com/',
'bind': {
'method': 'simple',
'password': 'secret'}
}" dn='cn=admin,dc=example,dc=com'
directives="('add', 'example', ['example_val'])"
'''
l = connect(connect_spec)
# convert the "iterable of values" to lists in case that's what
@ -477,6 +524,19 @@ def change(connect_spec, dn, before, after):
:returns:
``True`` if successful, raises an exception otherwise.
CLI example:
.. code-block:: bash
salt '*' ldap3.change "{
'url': 'ldaps://ldap.example.com/',
'bind': {
'method': 'simple',
'password': 'secret'}
}" dn='cn=admin,dc=example,dc=com'
before="{'example_value': 'before_val'}"
after="{'example_value': 'after_val'}"
'''
l = connect(connect_spec)
# convert the "iterable of values" to lists in case that's what

2
salt/modules/win_certutil.py
View File

@ -5,7 +5,7 @@ manager.
.. code-block:: bash
salt '*' certutil.install salt://cert.cer "TrustedPublisher"
salt '*' certutil.add_store salt://cert.cer "TrustedPublisher"
'''
# Import Python Libs

5
salt/returners/mysql.py
View File

@ -255,6 +255,11 @@ def returner(ret):
'''
Return data to a mysql server
'''
# if a minion is returning a standalone job, get a jobid
if ret['jid'] == 'req':
ret['jid'] = prep_jid(nocache=ret.get('nocache', False))
save_load(ret['jid'], ret)
try:
with _get_serv(ret, commit=True) as cur:
sql = '''INSERT INTO `salt_returns`

1
tests/integration/modules/sysmod.py
View File

@ -83,6 +83,7 @@ class SysModuleTest(integration.ModuleCase):
'cp.recv',
'libcloud_dns.get_driver',
'lxc.run_cmd',
'ipset.long_range',
'pkg.expand_repo_def',
'runtests_decorators.depends',
'runtests_decorators.depends_will_fallback',

1
tests/integration/netapi/rest_tornado/test_app.py
View File

@ -359,6 +359,7 @@ class TestMinionSaltAPIHandler(SaltnadoTestCase):
application.event_listener = saltnado.EventListener({}, self.opts)
return application
@skipIf(True, 'issue #34753')
def test_get_no_mid(self):
response = self.fetch('/minions',
method='GET',