Commit Graph

69587 Commits

Author SHA1 Message Date
Mike Place
d5a3e309bf Event assert (#33262)
* Initial POC

* Allow the queue to fill by waiting for the lag in IPC

* Add docs

* Add run_tests

* Add reactor to tests
2016-05-19 13:41:23 -06:00
rallytime
52b3128678 Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/states/boto_elb.py
2016-05-19 12:32:14 -06:00
Erik Johnson
8b3497b129 Catch exception raised from invalid verify_options (#33317)
* Catch exception raised from invalid verify_options

This fails the state gracefully in these cases.

Refs: 6b97161293 (r63577507)

* Raise an exception when package verification fails

* Catch failed package verification commands

Also, since pkg.verify is run separately on each targeted package, don't
add errors for each failure, just add one error to what we report.

* Update rpm test_verify test to reflect change from cmd.run to cmd.run_all
2016-05-19 12:13:30 -06:00
Martin Paulus
b8aa008da1 states/file.prepend: fixes #32915 define file header verbatim, in inp… (#33270)
* states/file.prepend: fixes #32915 define file header verbatim, in input order

* states/file.prepend: add header kwarg documentation to docstring
2016-05-19 11:09:50 -07:00
Andreas Lutro
8abf303183 Add support for kapacitor 0.13 (#33352)
* add support for kapacitor 0.13

* update kapacitor tests
2016-05-19 11:03:03 -07: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
Rob Nagler
0a35106df9 verify_socket: show what interface:port is in error; DRY refactoring (#33320)
* verify_socket: show what interface:port is in error; DRY refactoring

* indexes format strings
2016-05-19 09:23:58 -07:00
Eric Radman
9cd9cf65ea Eliminate dry-run false positives for files in /tmp (#33344)
cron.file() writes the crontab out to a temporary file before comparing
with the source. Asserting file ownership and permissions in this
context creates sometimes false positives.

This change does not affect highstate without test=True
2016-05-19 09:21:59 -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
Alexey Dubkov
e30ad3b6bd refs#33348: fix ret status code for state.sls_id (#33349) 2016-05-19 09:00:36 -07:00
Mike Zupan
1c35e3e578 adding the () to make changes work (#33337)
without this change it won't ever show any changes
2016-05-19 08:52:09 -07:00
phistrom
55be0abf4d Expanded documentation for boto_elb state and module (#33341)
* Describes what happens when the CNAME parameter is given.

* Describes what the recognized attributes are for for ELBs.
2016-05-18 19:02:20 -06: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
Mike Place
5528ccc552 Ponies! (#33346)
* Ponies!

* Docs

* Docs

* Highstate support

* Ponys are very linty
2016-05-18 18:57:13 -06:00
Joao Mesquita
31955cfc9b Add files map to fileserver cache event 2016-05-18 18:02:11 -03:00
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