valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
75,151 Commits 24 Branches 182 Tags 341 MiB
da8f5ac0c6
Commit Graph

75151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
371b0a86d9 Merge pull request #37736 from dhaines/issue-37732 
handle semodule version >=2.4 (#37732) and fix typo
 2016-11-24 03:44:20 +02:00
Mike Place
87aeb66fbf Merge pull request #37797 from clan/extfs 
check count of columns after split
 2016-11-24 03:28:59 +02:00
Mike Place
f7c7109152 Merge pull request #37762 from twangboy/fix_chocolatey_state 
Add pre_versions to chocolatey.installed
 2016-11-24 03:27:29 +02:00
Nicole Thomas
56baa92d55 Merge pull request #37866 from meaksh/2016.3-bp-37149-36938-36784 
Backport #37149 #36938 and #36784 to 2016.3
 2016-11-23 14:54:17 -07:00
Bo Maryniuk
91ed307af9 Sanitise input for the keys and IDs 2016-11-23 19:30:54 +01:00
Bo Maryniuk
86623f913d Add a stub for ID sanitiser (at the moment same as hostname) 2016-11-23 19:30:47 +01:00
Bo Maryniuk
637144c841 Rename "general.py" to "sanitisers.py" 2016-11-23 19:30:37 +01:00
Bo Maryniuk
f2571fc8bf Add hostname sanitiser 2016-11-23 19:30:29 +01:00
Bo Maryniuk
3ae086aff4 Add filename sanitiser 2016-11-23 19:30:22 +01:00
Bo Maryniuk
816b1d1977 Add general sanitisers 2016-11-23 19:30:10 +01:00
Bo Maryniuk
038374a586 Do not include "gpg-pubkey" packages, filtering by their name 2016-11-23 18:35:43 +01:00
Nicole Thomas
d0cc7f0d56 Merge pull request #37863 from rallytime/bp-36893 
Back-port #36893 to 2016.3
 2016-11-23 10:09:09 -07:00
Mihai Dinca
9d8d578109 Fix pkg.latest_version when latest already installed 2016-11-23 17:02:40 +00:00
Joerg Reuter
ffca0d491c - acl.delfacl: fix position of -X option to setfacl 2016-11-23 17:02:32 +00:00
rallytime
3dfed6b841 Adjust linux_acl unit test argument ordering 2016-11-23 17:02:23 +00:00
Silvio Moioli
f185ecdde1 core.py: quote style fixed 2016-11-23 17:02:07 +00:00
Pablo Suárez Hernández
8404d13424 Setting up OS grains for SLES Expanded Support (SUSE's Red Hat compatible platform) 2016-11-23 17:01:54 +00:00
Erik Johnson
47d21d9ed2 Don't skip pillar compilation when master_type=='disable' (#37843) 
This was broken in pull #32521. The community member who opened that PR
was apparently unaware of the fact that masterless minions will use the
Pillar instead of RemotePillar class, so skipping the Pillar compilation
here results in the packed pillar dunder being completely empty.

This PR fixes that by removing the check for master_type and allowing
local pillar data to be compiled.
 2016-11-23 09:43:01 -07:00
Sergey Kizunov
16ce844c54 Eliminate warning when 'ssl' not set (#37849) 
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>
 2016-11-23 09:40:28 -07:00
Dmitry Kuzmenko
0c607ccaec An example configuration for TLS/SSL. (#37859) 2016-11-23 09:38:16 -07:00
rallytime
4c70534991 Add versionadded to reauth option in dockerng module 2016-11-23 08:57:53 -07:00
Tyler Hunt
5ca2c388c2 added documentation for the new reuth option in docker registry configuration 
also fixed a typo in the new code where I used cred instead of creds
 2016-11-23 08:54:36 -07:00
Tyler Hunt
5b0c11ab47 add option to force a reauth for a docker registry 
Fixes #32829. Adds ability to specify reauth in the docker-registry pillar data structure to specify the reauth kwarg to docker-py login call. If not specified it defaults to old behaviour of False
 2016-11-23 08:54:36 -07:00
Sebastian Vela
b17a118e72 add multiline encryption documentation to nacl (#37847) 2016-11-22 15:27:13 -07:00
David J. Haines
7ef590a505 Update selinux.py 
Fixed (hopefully) a couple of issues with the commit. That's what I get for parroting (and for not really knowing Python syntax yet).
 2016-11-22 16:42:22 -05:00
Erik Johnson
7c1cfa82e4 Clarify the master_type docs (#37841) 
Mention when "disable" began to be supported.
 2016-11-22 11:44:46 -07:00
Sergey Kizunov
2bc42b8484 PY3: Fix exception when handling connect exception in TCP transport (#37831) 
When `self.auth.authenticate()` would throw this exception:
`raise SaltClientError(
'Attempt to authenticate with the salt master failed with timeout error')`

The code would throw an additional exception dealing with the original
exception as follows:

```
  File "...\salt\transport\tcp.py", line 500, in connect
      if '-|RETRY|-' not in exc:
      TypeError: argument of type 'SaltClientError' is not iterable
```

And since the final exception being thrown is `TypeError` instead of
`SaltClientError`, caller code would not correctly deal with this
case and the salt-minion would terminate.

Fix this by using Python 3 friendly `str(exc)` instead of plain
`exc` when doing a string search.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-11-22 08:27:04 -07:00
Nicole Thomas
dd81d2fa67 Merge pull request #37829 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-22 08:26:00 -07:00
rallytime
3d6d32edc5 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/development/contributing.rst
 2016-11-21 17:29:07 -07:00
Julien Cigar
aa3748744c add missing chloginclass (#37827) 
* add missing chloginclass

* Add versionadded tag

* Pesky whitespace fix
 2016-11-21 17:26:12 -07:00
Nicole Thomas
0e74bad284 Update branch refs to more relevant branch (#37826) 
And cleanup some :ref: links that are rendering incorrectly
 2016-11-21 16:41:02 -07:00
Nicole Thomas
6a9b49c782 Add "names" option to file state docs: point users to highstate doc examples (#37823) 
* Add "names" option to file state docs: point users to highstate doc examples

Fixes #19269

* Grammar fix
 2016-11-21 16:40:33 -07:00
Nicole Thomas
aaf587de63 Clarify keystone.user_present password state docs with default behavior (#37821) 
Fixes #15697
 2016-11-21 15:15:53 -07:00
Nicole Thomas
c300863159 Add some dependency documentation to libvirt docs (#37820) 
Fixes #5999
 2016-11-21 15:15:20 -07:00
Thomas S Hatch
485270f74e Merge pull request #37772 from bdrung/openssl1.1 
Support initializing OpenSSL 1.1
 2016-11-21 13:28:51 -07:00
Jorge Schrauwen
c66b51b9b9 network.routes should not raise exception if no interface (#37794) 
* network.routes should not raise exception if no interface

* use >= instead of ==
 2016-11-21 13:25:53 -07:00
Nicole Thomas
4910912ffa Update orchestrate runner file.copy doc example (#37817) 
The kwarg arguments should be a dictionary, and not a list.

Fixes #37383
 2016-11-21 13:23:08 -07:00
Nicole Thomas
628c4a3d27 Merge pull request #37815 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2016-11-21 13:22:49 -07:00
Nicole Thomas
c5d3d8b66a Merge pull request #37816 from rallytime/bp-32157 
Back-port #32157 to 2016.3
 2016-11-21 13:22:27 -07:00
Thomas S Hatch
0b30b93dbb Merge pull request #37776 from DSRCorporation/features/37449_tls 
Full TLS/SSL options support as provided by Tornado TCPServer.
 2016-11-21 13:11:51 -07:00
Nicole Thomas
97e6b6aabe Merge pull request #37812 from rallytime/bp-37790 
Back-port #37790 to 2016.3
 2016-11-21 11:46:40 -07:00
Nicole Thomas
27703c54bc Merge pull request #37811 from rallytime/bp-37789 
Back-port #37789 to 2016.3
 2016-11-21 11:46:21 -07:00
Nicole Thomas
adac9d7c0c Merge pull request #37810 from rallytime/bp-37775 
Back-port #37775 to 2016.3
 2016-11-21 11:45:53 -07:00
Mike Place
d9c297119e Add quotes to cron doc 
Closes #31953
 2016-11-21 11:17:44 -07:00
rallytime
c6b5fd3715 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2016-11-21 11:07:08 -07:00
Adrian Todorov
ca3b6e7874 Update proxmox.rst with more options and LXC 2016-11-21 10:26:59 -07:00
Dmitry S. Fedorov
ba3fef48e1 fix comment 2016-11-21 10:25:27 -07:00
Dmitry S. Fedorov
a021f76a9b issue: 37751 
Add documentation for option privileged
 2016-11-21 10:25:27 -07:00
calve
2bed91437b Document python argument in salt.states.virtualenv_mod 2016-11-21 10:23:15 -07:00
Mike Place
7de784411d Add nodegroup check to ckminions (#37763) 
Closes #37742
 2016-11-21 09:43:16 -07:00