Commit Graph

69394 Commits

Author SHA1 Message Date
Pedro Algarvio
d0c79c4333
Check all ports on the salt-master 2016-05-23 13:56:04 +01:00
Pedro Algarvio
004c7f340b
Disable minion keep alive on linux 2016-05-23 13:56:04 +01:00
twangboy
893894ee70
Add handling to the script template for windows 2016-05-23 13:56:03 +01:00
Pedro Algarvio
e8d3713e6c
More windows friendly. Don't rely on PYTOHNPATH 2016-05-23 13:56:03 +01:00
Pedro Algarvio
c6612482c0
Windows raises EACCES 2016-05-23 13:56:03 +01:00
Pedro Algarvio
eb82b8d229
Remove unnecessary logic 2016-05-23 13:56:03 +01:00
Pedro Algarvio
177d9c4ead
Don't traceback if the process is no longer running. 2016-05-23 13:56:03 +01:00
Pedro Algarvio
e1e1aeb3d7
Keep ports open throughout the tests execution 2016-05-23 13:56:02 +01:00
Pedro Algarvio
5e014d59eb
We're not in a IOLoop 2016-05-23 13:56:02 +01:00
Pedro Algarvio
0a3f5dfbdd
Make sure we're not getting the same port over and over again. 2016-05-23 13:56:02 +01:00
Pedro Algarvio
84861197bb
VT is not available for windows 2016-05-23 13:56:02 +01:00
Pedro Algarvio
50a4fd1dd1
Lint fixes 2016-05-23 13:56:02 +01:00
Pedro Algarvio
f69dc8ef7f
Fix variable reference 2016-05-23 13:56:02 +01:00
Pedro Algarvio
7a8460856c
Define IDs and ports on sample configs 2016-05-23 13:56:01 +01:00
Pedro Algarvio
ca93b6421c
CLI daemons improvements 2016-05-23 13:56:01 +01:00
Pedro Algarvio
db88f61ee4
Reset signals before instantiating the process 2016-05-23 13:56:01 +01:00
Pedro Algarvio
f879955f88
Reset signals before defining the process 2016-05-23 13:56:01 +01:00
Pedro Algarvio
c264600738
Provide some feedback of whats happening. 2016-05-23 13:56:01 +01:00
Pedro Algarvio
184c3c83ad
Run the test daemons from CLI
This should help running the test suite on Windows machines
2016-05-23 13:56:00 +01:00
Nicole Thomas
336fbb03bc [develop] Merge forward from 2016.3 to develop (#33408)
* 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.

* Allow concurrency mode in state runs if using sudo (#33325)

Closes #30130

* Disambiguate non-exact matches when checking if sysv service is enabled (#33324)

Fixes #33323

* 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.

* import ps from psutil_compat in beacons (#33334)

* beacons.network_info: import gate psutil

* beacons.ps: import gate psutil

* 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.

* 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.

* Fix network.managed for windows (#33312)

* Fix some link errors in the test writing tutorial (#33347)

* Describes parameters in register_instances function (#33339)

* Fix UnboundLocalError in git.latest (#33340)

Resolves #32260.

* 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.

* 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.

* 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

* Remove mentions of windows not supporting pkgs param (#33361)

Fixes #33313

* 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

* revved 2015.8 branch to .9 in version selector

* Add initscripts, SystemD service units and environment files for Debian (#32857)

* Add note to docs about api settings for Hipchat API v2 (#33365)

Fixes #27779

* Add win_pkg to list of modules that support "version" in pkg.installed (#33362)

Fixes #32913

* Add note about name parameter in git_pillar docs (#33369)

Fixes #27737

* Better YAML syntax error handling (#33375)

Closes #26574

* Improve doc clarity for disable_modules documentation (#33379)

* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name

* maintain the fallabck because I am totally sick of this crap

* blast, put the try/except int he right place

* restore whitespace

* Fix traceback in logging for config validation (#33386)

* 2015.8.10 release notes

* Sync pillarstack to latest upstream version (#33391)

* Don't lay down all available opts (#33385)

* Don't lay down all available opts

* We need at least one opt in there

* Condense defaults

* Put the default hash type back
2016-05-20 13:48:40 -07:00
Dmitry Kuzmenko
17b03e9d8b Allow to blacklist/whitelist renderers. (#33358)
* Allow to blacklist/whitelist renderers.

* Fix tests.

* Unit test for renderer blacklisting.

* Minor tests fixes
2016-05-20 10:41:51 -07:00
Tom Eastman
aba45e9be3 Spelling correction. (#33387) 2016-05-20 09:50:39 -06:00
jacobhammons
9f42882ed7 Merge pull request #33373 from jacobhammons/release-update-dev
revved latest to 2015.8.9
2016-05-19 14:11:28 -06:00
Jacob Hammons
c56d25cf02 revved latest to 2015.8.9, added note regarding Mint Linux to 2015.8.9 release notes 2016-05-19 14:10:27 -06:00
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
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
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
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
Mike Place
5528ccc552 Ponies! (#33346)
* Ponies!

* Docs

* Docs

* Highstate support

* Ponys are very linty
2016-05-18 18:57:13 -06: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
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