Commit Graph

70256 Commits

Author SHA1 Message Date
Michael Walton
750114a418 Small documentation clarification 2016-06-12 19:15:29 -04:00
Michael Walton
4b407fe4c5 document report_reboot_exit_codes in pkg.py state code 2016-06-12 19:08:11 -04:00
rforkosh
d622133a49 The jid load comes in directly, not as 'load' key. Should return the mongo record directly without accessing keys 2016-06-12 18:01:22 -05:00
Julien Cigar
6f191d8f51 Use ipaddress module, refactoring, fixes some pylint issues, add support for sortlist 2016-06-12 23:16:27 +02:00
Julien Cigar
8651bff4a6 add a grains to indicate whether IPV6 is supported on the host 2016-06-12 21:51:59 +02:00
Adam Chainz
64d9a62f89 Convert readthedocs links for their .org -> .io migration for hosted projects
As per [their blog post of the 27th April](https://blog.readthedocs.com/securing-subdomains/) ‘Securing subdomains’:

> Starting today, Read the Docs will start hosting projects from subdomains on the domain readthedocs.io, instead of on readthedocs.org. This change addresses some security concerns around site cookies while hosting user generated data on the same domain as our dashboard.

Test Plan: Manually visited all the links I’ve modified.
2016-06-11 12:33:37 +01:00
Tobias Macey
20be3b9ceb Add modules for wrapping TestInfra
In order to allow for executing unit tests in the context of salt states
and formulas these modules wrap the Testinfra library and expose its
functionality in familiar salt syntax.

This allows for parameterizing tests using pillar data, tying the tests
into requisite systems, generating events based on test results, and
many other features.
2016-06-11 06:48:48 -04:00
Mike Place
139432fe14 Fix loop over cache in auth checking! 2016-06-10 16:25:04 -06:00
Mike Place
98f3a482ac Save an entire minion cache traversal on each master pub
We were doing an extra and unecessary full traversal of the minion
cache. This refactors all returners and the master to reduce this
to a single call. More work will be forthcoming to reduce this even
further, especially in the context of auth lookups.
2016-06-10 15:43:08 -06:00
rallytime
b4ab322ce1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/saltutil.py
2016-06-10 13:41:53 -06:00
Nicolas Delaby
f806c7e290 [boto_lambda] handle ommitted Permissions parameter (#33908)
* a bit of pep8

* Don't fail if `Permssions` is None
2016-06-10 13:31:22 -04:00
Mike Place
b3ec39d644 Correct issue with ping on rotate with minion cache (#33765)
Only check connected minions if we have the data to do so. Closes #29525
2016-06-10 13:17:08 -04:00
Mike Place
96d786c9e4 Merge pull request #33858 from rdutch/add_join_domain_state
Added a join domain state function
2016-06-10 09:10:37 -07:00
Nicole Thomas
3e0de919c7 Added versionadded to new absolute option (#33937)
Refs #33918
2016-06-10 12:08:12 -04:00
Mike Place
e1beac55c5 Merge pull request #33884 from plastikos/issue-33730
Pass through "greedy" parameter rather than hard-coded "True"
2016-06-10 08:59:49 -07:00
Mike Place
378dd7ca06 Merge pull request #33888 from jfindlay/random_check
random.org checks
2016-06-10 08:45:07 -07:00
Mike Place
16b5e9dcc1 Merge pull request #33896 from DSRCompany/issues/33575_do_not_deep_copy_context
Don't deep copy context dict values.
2016-06-10 08:32:54 -07:00
Mike Place
175d3eecb7 Merge pull request #33902 from terminalmage/fix-repack-dictlist
Add non-strict behavior for repack_dictlist
2016-06-10 08:28:22 -07:00
Nicole Thomas
2dc1914e7c Add connecting_settings to boto_elb state attributes list (#33936)
Refs #31499
2016-06-10 11:28:11 -04:00
Mike Place
29a037dae3 Merge pull request #33909 from xlotlu/patch-1
fix formulas map.jinja example when using default values
2016-06-10 08:24:48 -07:00
Mike Place
01323322b0 Merge pull request #33905 from rallytime/bp-33847
Back-port #33847 to 2016.3
2016-06-10 08:22:34 -07:00
Mike Place
b9b19b2ca3 Merge pull request #33914 from babilen/salt-api-terminate-cgroup
Remove KillMode=process from salt-api unit file
2016-06-10 08:17:39 -07:00
Joseph Hall
91a2184f2d Wait for up to a minute for sync_after_install (#33917) 2016-06-10 11:14:59 -04:00
Mike Place
abf5131c0a Adds absolute value option to disk state (#33918) 2016-06-10 11:08:57 -04:00
Ethan Moore
79b8772f8e Add documentation comment that only the read-only attribute is applied on Windows systems if the extract_perms flag is True 2016-06-10 14:57:33 +00:00
Long
2a24ac65ae correct spelling (#33924)
* correct spelling

* Update lazy.py
2016-06-10 10:40:38 -04:00
Tamas Pal
4c691cf51b ssh: keep original permissions, when hashing known_hosts
ssh-keygen sets the newly created known_hosts file's permissions to
0600. It's good for user's personal files, but bad idea for the global
ones, like /etc/ssh/ssh_known_hosts. This patch record's the original
file's permissions, and sets them on the hashed one after hashing.
2016-06-10 12:54:08 +02:00
Nicole Thomas
c71b1c0f5c Merge pull request #33913 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-06-09 19:02:28 -04:00
rallytime
fd9a618e36 Fix merge error caught by tests 2016-06-09 16:08:19 -06:00
Thomas S Hatch
3998aa5faa Add docs 2016-06-09 15:50:49 -06:00
rallytime
e55952f548 Add boto3 to utils call 2016-06-09 14:49:24 -06:00
Thomas S Hatch
509c0c1195 Add cmd white and blacklists 2016-06-09 14:33:34 -06:00
rallytime
c061fcb18e Pylint fix 2016-06-09 13:31:15 -06:00
Wolodja Wentland
4763b79479 Remove KillMode=process from salt-api unit file
Restarting the salt-api service should also terminate processes in the
same context group to ensure that they are being stopped cleanly.
2016-06-09 21:25:35 +02:00
rallytime
f078d57b57 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/modules/rabbitmq.py
  - salt/modules/win_servermanager.py
  - salt/state.py
  - salt/states/boto_s3_bucket.py
  - salt/states/pip_state.py
  - salt/states/win_servermanager.py
  - tests/unit/modules/win_servermanager_test.py
  - tests/unit/states/dockerng_test.py
2016-06-09 13:06:10 -06:00
Erik Johnson
62edce685f Merge pull request #33792 from babilen/salt-master-terminate-cgroup
Do not use KillMode=process for salt-master
2016-06-09 13:18:56 -05:00
Mike Place
261baeb5b5 Ensure tht pillar have freshest grains (#33910) 2016-06-09 14:13:10 -04:00
Nicole Thomas
08a584b3e5 Merge pull request #33711 from rallytime/merge-develop-3
[develop] Merge forward from 2016.3 to develop
2016-06-09 14:12:48 -04:00
jwagoner0
16e61d59fc Support additional eselect parameters. (#33876)
* Add action_parameter to get_target_list.  The PHP eselect module
requires the type to be passed in.  Other eselect modules appear to
ignore any params passed to list.
e.g. eselect php list cli

Change set command in state to pass action_parameter to get_target_list.

* Added versionadded tag
2016-06-09 14:00:21 -04:00
Mike Place
3c0b3f636e Ensure tht pillar have freshest grains 2016-06-09 10:50:45 -06:00
Ionuț Ciocîrlan
77ebe74fae fix formulas map.jinja example when using default values
Fixed syntax error and replaced `default` kwarg with `base`.

The previous form would lead e.g. for RedHat to `Rendering SLS '...' failed: Jinja variable 'dict object' has no attribute 'server'`.
2016-06-09 19:27:00 +03:00
Erik Johnson
1eac378176 Use strict=True when repacking dictlists 2016-06-09 10:54:46 -05:00
Erik Johnson
4e8ff55583 Add non-strict behavior for repack_dictlist
This was omitted in f9c54f4.
2016-06-09 10:54:46 -05:00
Michael Walton
41fa9e50c6 lint fix 2016-06-09 11:19:17 -04:00
Seth House
b6ebd7b6ef Add docs for arg/kwarg eauth matching
This adds documentation for the addition in #29153.
2016-06-09 09:13:02 -06:00
Ethan Moore
b4475b5449 Update extract_perms parameter documentation 2016-06-09 14:58:37 +00:00
Michael Walton
cdbd937abf Move report_reboot_exit_codes to a kwarg.
This was done because of a recommendation by lorengordon.
2016-06-09 10:53:57 -04:00
Nicole Thomas
00e016ecfc Add note about Xenial packages to 2016.3.0 release notes (#33870)
Refs #32761
2016-06-09 10:52:16 -04:00
Nicole Thomas
ef6da0be5d Merge pull request #33877 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-06-09 10:50:42 -04:00
Hrumph
2d665e2a3f KeyError isse in win_pkg.genrepo function (#33891)
* In pkg.genrepo
__opts__['render_blacklist'] but 'render_blacklist' is not always an index
in __opts__, so I repaced it with
__opts__.get('render_blacklist',"")

I did the same thing with __opts__['render_whitelist']
Before I did this I would get a KeyError exception when I ran
pkg.refresh_db.

This is only occuring in the devel branch.

* lint fix
2016-06-09 10:48:09 -04:00