Commit Graph

61817 Commits

Author SHA1 Message Date
Jacob Hammons
146b4df6be Updates docs version to 2015.8.9
Adds note regarding the os grain on Mint Linux
Adds an FAQ regarding grains that change due to upstream changes
2016-05-19 13:41:35 -06:00
Nicole Thomas
f248003ac2 Remove mentions of windows not supporting pkgs param (#33361)
Fixes #33313
2016-05-19 11:02:47 -07:00
Nicole Thomas
4fdb097c01 Update job_cache and keep_jobs docs to be more specific to their behavior (#33328)
* Update job_cache and keep_jobs docs to be more specific to their behavior

Also fixed a bug discovered when investigating job_cache/keep_jobs functionality
where the jid directory and files were removed by the cache cleaner, but not the
original jid clash detection directory created in /var/cache/salt/master/jobs/.

Fixes #29286

* Add testcase for the changes in the local_cache.clean_old_jobs func

* Mark tests as destructive

* Put destructive test decorator in correct location
2016-05-19 09:32:32 -07:00
Erik Johnson
2f06918dad Properly detect newer Linux Mint distros (#33359)
* Properly detect newer Linux Mint distros

LMDE 2 and Linux Mint 17.3 changed the DISTRIB_ID in /etc/lsb-release to
``LinuxMint``, breaking OS detection for these distros.

This commit fixes that by adding an entry to the OS_NAME_MAP in the core
grains.

* Remove LinuxMint os_family from aptpkg.py

It is no longer necessary as the distro is now detected properly, which
will lead to an os_family of Debian.
2016-05-19 09:04:04 -07:00
Erik Johnson
d85096ce63 Fix UnboundLocalError in git.latest (#33340)
Resolves #32260.
2016-05-18 19:01:22 -06:00
phistrom
e602446d54 Describes parameters in register_instances function (#33339) 2016-05-18 19:00:56 -06:00
Nicole Thomas
5c29c65ff4 Fix some link errors in the test writing tutorial (#33347) 2016-05-18 18:57:50 -06:00
Shane Lee
e532e5883c Fix network.managed for windows (#33312) 2016-05-18 09:40:06 -07:00
C. R. Oldham
11a25255ec Bp 28467 calm mine (#33327)
* make minion mine update behavior more configurable

* Add docs for mine_functions config var

* Remove config dup from mine config options

Refs #28467

* 2015.8 does not have _DFLT_MULTIPROCESSING_MODE

* This won't be in until 2015.8.10.
2016-05-18 09:37:41 -07:00
Justin Findlay
b897f2cba8 import ps from psutil_compat in beacons (#33334)
* beacons.network_info: import gate psutil

* beacons.ps: import gate psutil
2016-05-18 09:31:38 -07:00
Justin Findlay
089c1a2513 remove redundant, incorrect sudo_runas config documentation (#33318)
* remove sudo_runas documentation

`sudo_runas` was renamed to `sudo_user` and the documentation was not
updated accordingly.

* conf/minion: update sudo_user description

The description from sudo_runas was better.
2016-05-18 09:15:42 -07:00
Erik Johnson
1f7fda212b Disambiguate non-exact matches when checking if sysv service is enabled (#33324)
Fixes #33323
2016-05-18 09:10:02 -07:00
Mike Place
8c1f19a7e6 Allow concurrency mode in state runs if using sudo (#33325)
Closes #30130
2016-05-18 09:04:45 -07:00
Dmitry Kuzmenko
ed14ef22b2 Fix master hanging after a request from minion with removed key. (#33333)
* ZMQ monitor for MWorker connections.

* Reauth minion if the key was removed on the master side.
2016-05-18 09:02:49 -07:00
Nicole Thomas
daafa27b60 Cleanup comments in smbios.get output (fixes #33266) (#33306)
As also noted in https://github.com/saltstack/salt/issues/33266, sometimes `dmidecode` will output additional commentary text in strings:

```
root@n01:~# dmidecode -s system-manufacturer                                                                                                                                                                                        
# SMBIOS implementations newer than version 2.8 are not
# fully supported by this version of dmidecode.
Supermicro
```

This PR filters those out.
2016-05-17 13:31:41 -06:00
gerhardqux
bfe12d9300 Fix iptables --match-set (#23643) (#33314)
Function is expecting two arguments. But after processing state only one
parameter (it contain two words) is pushed into list of options.
This patch reverts the parsing of "iptables --match-set" to the
behaviour of salt v2014.*.

This is a backport of https://github.com/saltstack/salt/pull/28325

Closes #23643
2016-05-17 13:31:06 -06:00
Nicole Thomas
d0ed1616b0 Merge pull request #33308 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-17 13:26:05 -06:00
rallytime
1c43a62f85 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-17 11:23:41 -06:00
Justin Findlay
7455d0da9b update 2015.8.9 release notes (#33310) 2016-05-17 11:13:09 -06:00
Thomas S Hatch
e3eff27c55 Merge pull request #33293 from twangboy/fix_33277_2015_8
Fix minion start retry on Windows (2015.8)
2016-05-17 11:03:41 -06:00
Nicole Thomas
9b42a05519 Added some more docs for master and minion config settings (#33292)
* Added some more docs for master and minion config settings

Configs addressed:
  - auth_safemode
  - auth_timeout
  - conf_file
  - gather_job_timeout
  - jinja_lstrip_blocks
  - jinja_trim_blocks
  - max_event_size

* Change "sub minion" to "sub-minion"
2016-05-17 09:58:20 -07:00
Nicole Thomas
22c433184d linux_acl: Allow '-' as a separation character in ACL permissions. Fixes #31270 (#33172) (#33305)
This allows using acl states with things like '- perms: r-x' or '- perms: r--', which also works when manually setting ACL's using setfacl.
2016-05-17 09:53:20 -07:00
rallytime
5004d2fa61 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-17 10:36:07 -06:00
gerhardqux
8acee5e06c Fix iptables --match-set (#23643) (#33301)
Function is expecting two arguments. But after processing state only one
parameter (it contain two words) is pushed into list of options.
This patch reverts the parsing of "iptables --match-set" to the behaviour
of salt v2014.*.

This is a backport of https://github.com/saltstack/salt/pull/28325

Closes #23643
2016-05-17 10:24:14 -06:00
Julien BONACHERA
7a181f2062 Handle more ipv6 error as an exception #33299 (#33300)
* Handle ipv6 exception in scp_file()

* Handle ipv6 exception in sftp_file()
2016-05-17 10:03:03 -06:00
Erik Johnson
eb47a15a5e Ignore retcode when checking service's status (#33294)
* Pass an actual error message when raising exception

* debian_service.py: ignore retcode when checking service's status

This prevents spurious errors from being logged when a nonexistant
service is polled, or the service is not running.

* freebsdservice.py: ignore retcode when checking service's status

This prevents spurious errors from being logged when a nonexistant
service is polled, or the service is not running.

* netbsdservice.py: ignore retcode when checking service's status

This prevents spurious errors from being logged when a nonexistant
service is polled, or the service is not running.

* openbsdservice.py: ignore retcode when checking service's status

This prevents spurious errors from being logged when a nonexistant
service is polled, or the service is not running.
2016-05-17 07:08:59 -07:00
David Boucha
757ef20a31 fix "loose" typo (#33290) 2016-05-16 17:13:40 -06:00
twangboy
652f0079db Fix minion start retry on Windows 2016-05-16 15:46:54 -06:00
Nicole Thomas
b7d98da64d Add auth_tries config option to minion.rst docs (#33287) 2016-05-16 14:17:19 -07:00
Nicole Thomas
061851bcbf Document minion_id_caching config value (#33282)
Fixes #33276
2016-05-16 13:12:38 -07:00
Nicole Thomas
06edba448e Merge pull request #33274 from rallytime/merge-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-16 10:41:32 -06:00
rallytime
bf641d3a66 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-16 10:14:43 -06:00
Nicole Thomas
4f3596a69f Add comment for test=true w/o changes ret and add changes dict example (#33254)
Fixes #30258

Add simple changes dictionary example
2016-05-15 13:13:43 -07:00
Nicole Thomas
2a30c4879b Update Git Policy docs to match Contribution guide (#33252)
Fixes #30946
2016-05-15 13:08:37 -07:00
Loren Gordon
8fa72f6588 Clarify file.replace MULTILINE flag interaction with regex anchors (#33137)
Fixes #33118
2016-05-13 15:39:06 -06:00
Clint Armstrong
056c273d51 Fix #33238 (#33239)
* Fix #33238

* pep8
2016-05-13 15:35:01 -06:00
Erik Johnson
1cd34ab299 Properly report on invalid gitfs/git_pillar/winrepo repos (#33245) 2016-05-13 15:33:44 -06:00
Thomas S Hatch
94a53da92e Merge pull request #33253 from rallytime/fix-30605
Update the release process docs
2016-05-13 15:28:11 -06:00
rallytime
a129d05b6d Update the release process docs
Fixes #30605
2016-05-13 14:28:57 -06:00
Justin Findlay
8c2c5b13f0 update 2015.8.9 release notes (#33251) 2016-05-13 13:54:16 -06:00
Joseph Hall
8ee8ee3b3a Handle ipv6 error as an exception (#33246) 2016-05-13 13:23:16 -06:00
Erik Johnson
855bed36c1 Check rendered YAML for invalid keys (#33213)
* Check rendered YAML for invalid keys

PyYAML will for some reason allow improper YAML, specifically double
curly-braces like ``{{ }}``, to be formed into an unhashable dict (that
is, one with a dict as a key). This commit will change the YAML renderer
such that the rendered data is recursively checked for keys that are
dicts, and raises an SaltRenderError if such a key is encountered.

Resolves #33073.

* Fix smtp returner test

This test was using jinja placeholders but was not passing the template
through the jinja renderer. This commit adds the use of the jinja
renderer to this test to fix the failure caused by the addition of
verification of the loaded YAML inthe previous commit.
2016-05-13 09:22:43 -07:00
Nicole Thomas
6fb25a8440 Make note of files that begin with '_' in master.d or minion.d dirs (#33224)
* Make note of files that begin with '_' in master.d or minion.d dirs

Fixes #21903

* Be more specific about where '_' files come from.
2016-05-13 09:14:57 -07:00
Nicole Thomas
a6dc0d2d05 Gate jnpr imports in salt.proxy.junos.py (#33150)
* Gate jnpr imports in salt.proxy.junos.py

Fixes #31975

The doc build fails when these are not gated because jnpr raises
an ImportError.

* Remove logging line for copy/paste
2016-05-13 09:13:22 -07:00
Nicole Thomas
64a89c4883 Add docs for the http state (#33222)
* Add docs for the http state

Fixes #21315

* Fix typo
2016-05-13 09:07:58 -07:00
Nicole Thomas
0a32163d63 Don't stacktrace when using --out=highstate at CLI during staterun. (#33215)
Fixes #29796
2016-05-13 08:23:35 -07:00
Laurent
04d714df6a propagate opts to salt.util.http call (#33219) 2016-05-13 08:03:24 -07:00
Justin Findlay
c8236c05cb update 2015.8.9 release notes (#33237) 2016-05-13 08:40:23 -06:00
Justin Findlay
4b1f460256 update 2015.5.11 release notes (#33236) 2016-05-13 08:30:59 -06:00
Nicole Thomas
6dc5d605b1 Merge pull request #33217 from rallytime/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2016-05-12 16:45:39 -06:00