Commit Graph

69628 Commits

Author SHA1 Message Date
Nicole Thomas
ea5ddaee6e Merge pull request #33336 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-05-18 10:42:05 -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
C. R. Oldham
d375c1fe37 Add docs for mine_functions config var (#33326)
* Add docs for mine_functions config var

* Note that mine_enabled essentially just doesn't add the mine
update function to the scheduler.
2016-05-18 09:32:06 -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
rallytime
7bf9f5d0f5 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/man/salt.7
  - doc/ref/executors/all/salt.executors.direct_call.rst
  - doc/ref/executors/all/salt.executors.splay.rst
  - doc/ref/executors/all/salt.executors.sudo.rst
  - salt/cloud/clouds/vultrpy.py
2016-05-18 09:40:48 -06:00
Nicole Thomas
98383de11c Merge pull request #33322 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-05-17 17:01:07 -06:00
rallytime
d66c992918 Don't merge-forward the change to salt/scripts.py 2016-05-17 14:11:34 -06:00
rallytime
779f31cc20 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-05-17 13:41:19 -06: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
Nicole Thomas
ced3223b35 Back-port #32993 to 2016.3 (#33304)
* privateIPs and privateDNS are expected to be JSON encoded strings (#32993)

* Import json
2016-05-17 13:31:27 -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
Erik Johnson
409b187e03 Merge branch 'pr-33147' into develop 2016-05-17 12:55:31 -05:00
Erik Johnson
96f237d9f2 Improve package verification documentation 2016-05-17 12:52:48 -05:00
Erik Johnson
57df1b5161 Accept verify_options and ignore_types as a comma-separated list
Also, simplify the logic used to convert the options passed in
verify_options to command-line arguments.
2016-05-17 12:49:39 -05:00
Shane Lee
348c0364e1 Fix minion start retry on Windows (2016.3) (#33285)
* Fix retry minion start for windows

* Implement Sergey's Fix
2016-05-17 10:38:53 -07:00
rallytime
1c43a62f85 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-17 11:23:41 -06:00
Erik Johnson
b4dab44d31 Merge branch 'pkg-verify-options' of https://github.com/lorengordon/salt into pr-33147 2016-05-17 12:15:00 -05: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
Ronald van Zantvoort
8b59f41fa0 Cleanup comments in smbios.get output (fixes #33266) (#33302)
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 09:56:31 -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
Nicole Thomas
7a7018261e Server Density agentv2 support (#32772) (#33303)
* Added support for the agentv2

* Updated os field to match the SD API requirement

* filename is an absolute path on official installations

* Install script URL uses a redirect now, so we should instruct curl to follow them

* Added a missing import

* Updated the settings for the v2 agent

* Fixed pep8 issues

* select v2 agent for the test
2016-05-17 09:50:36 -07:00
rallytime
5004d2fa61 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-17 10:36:07 -06:00
jacobhammons
7e95127467 man pages updated (#33307)
sphinx build fixes
doc additions for new modules including thorium
2016-05-17 10:24:44 -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
Vincas Dargis
28bc3952ac Fix documentation typo in salt.modules.state.high (#33297)
salt.modules.state.high documentation has typo "andis" instead of "and is".
2016-05-17 07:36:12 -07: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
Erik Johnson
a2cd7f9be0 Merge pull request #33286 from rallytime/doc-new-configs
Document new master and minion config opts for 2016.3.0
2016-05-16 19:44:02 -05: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
8d805e6595 Lint #32985 (#33278)
* Fix context clash.

boto_vpc uses both boto and boto3. Both utils for those use the same name for their connection context. If you used states that required both boto and boto3, the get_conn would return the object.

* Add a unit test to the boto context conflict problem

* Fix pylint errors and ensure new test to runs correctly

Merges #32985

* Fix typo
2016-05-16 15:02:05 -06:00
Nicole Thomas
9e79250f31 Merge pull request #33279 from rallytime/merge-develop
[develop] Merge forward from 2016.3 to develop
2016-05-16 15:01:39 -06:00
rallytime
fdc877b4dc Document new master and minion config opts for 2016.3.0
Docs were added for:
  - master_tries
  - mine_enabled
  - mine_return_job
  - syndic_failover
  - auth_tries: this is an old setting, but docs were not found
in the minion.rst docs. This change should be added to older branches.
2016-05-16 14:51:13 -06:00
Nicole Thomas
061851bcbf Document minion_id_caching config value (#33282)
Fixes #33276
2016-05-16 13:12:38 -07:00
Seth House
01ce818092 Finish the match.filter_by example (#33281) 2016-05-16 13:12:07 -07:00
C. R. Oldham
8387657d9a Prevent salt-cloud from hanging when spinning up new Vultr instances (#33272)
* better support for named images, locations, sizes

* better support for named images, locations, sizes

* Tests for Vultr driver

* Add sleep so test instance will be old enough to delete as part of the test

* Lint.
2016-05-16 13:11:29 -07:00
rallytime
799993a6c7 Pylint fix 2016-05-16 13:48:13 -06:00
Nicole Thomas
59a84a4674 Add docs for new master failback options (#33280)
Fixes #32492
2016-05-16 12:11:38 -07:00
rallytime
c8b8d82745 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/proxy/junos.py
2016-05-16 12:32:23 -06:00
Nicole Thomas
2985aef0ac Merge pull request #33275 from rallytime/merge-2106.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-05-16 11:59:57 -06:00
jirikotlin, jiri.kotlin@ultimum.io
319a4d8288 Files without pkg.owner are not skipped (#33202) 2016-05-16 10:02:51 -07:00