valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,528 Commits 24 Branches 182 Tags 341 MiB
d9962dc1c4
Commit Graph

69528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nicole Thomas
7d45e920c7 Merge pull request #33404 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-05-20 11:36:55 -06:00
Nicole Thomas
04ac89d488 Add note about reload_modules functionality for pkg.installed (#33374) 
Fixes #29252
 2016-05-20 10:32:47 -07:00
Nicole Thomas
637c2af0ad Add note to absolute_imports practice about __future__ import (#33377) 
Fixes #31430
 2016-05-20 10:32:25 -07:00
Nicole Thomas
d35b81de35 Document how to set the alias file location for alias state (#33380) 
Fixes #21720
 2016-05-20 10:28:02 -07:00
Joseph Hall
4b62c9b98c 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 11:16:52 -06:00
Bruno Binet
0e206e94fb Sync pillarstack to latest upstream version (#33391) 2016-05-20 10:03:22 -07:00
rallytime
1febb0e13a Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-05-20 10:35:25 -06:00
jacobhammons
3c9def310c Merge pull request #33403 from jacobhammons/dot10 
2015.8.10 release notes
 2016-05-20 10:02:50 -06:00
Jacob Hammons
e850c298a9 2015.8.10 release notes 2016-05-20 10:01:32 -06:00
Nicole Thomas
91059224f6 Merge pull request #33381 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-05-20 09:58:11 -06:00
Nicole Thomas
a937b7ec22 Merge pull request #33382 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-05-20 09:55:16 -06:00
Tom Eastman
aba45e9be3 Spelling correction. (#33387) 2016-05-20 09:50:39 -06:00
Joao Mesquita
0f4d7b3bbf Fix linting 2016-05-19 23:18:21 -03:00
Erik Johnson
946d27e82a Fix traceback in logging for config validation (#33386) 2016-05-19 17:46:46 -07:00
rallytime
5aec32b20f Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-19 18:18:10 -06:00
Thomas S Hatch
d15f5e2cef Merge pull request #33383 from thatch45/2015.5 
maintain the fallabck because I am totally sick of this crap
 2016-05-19 18:03:59 -06:00
Hannes Körber
5ad305cedf
firewalld: Add service state. 2016-05-20 01:04:49 +02:00
Hannes Körber
b8a889497a
firewalld: Change behavior of present state. 
See issue #33159 for an explanation:

https://github.com/saltstack/salt/issues/33159
 2016-05-20 01:01:43 +02:00
Hannes Körber
f27ac3c180
firewalld: Use set operations. 
The nested for-loops and if-statements are replaced with simple set
differences. This is more concise and readable.
 2016-05-20 01:01:43 +02:00
Hannes Körber
317b7002bb
firewalld: Simlify port forwarding. 
Forwarding rules are now represented as objects, which makes comparison
much easier. Also, parsing of the salt-specific syntax for port forwards
is done in a single function, `_parse_forward()`.
 2016-05-20 01:01:43 +02:00
Hannes Körber
5c1b8fc246
firewalld: Add methods for modifying services. 
The methods to not have a `permanent` parameter because those operations
are only allowed for the permanent configuration anyway.
 2016-05-20 01:01:42 +02:00
Hannes Körber
59d8a3a5a1
firewalld: Add reload() method to module. 
reload_rules() was chosen over reload() because of pylint complaining
about redefining the reload() builtin.
 2016-05-20 01:01:42 +02:00
Thomas S Hatch
f5ebcba21c restore whitespace 2016-05-19 17:01:19 -06:00
Thomas S Hatch
1d8b289db1 blast, put the try/except int he right place 2016-05-19 17:00:16 -06:00
Thomas S Hatch
081e6c5b83 maintain the fallabck because I am totally sick of this crap 2016-05-19 16:33:15 -06:00
Mike Place
755acfb97e Improve doc clarity for disable_modules documentation (#33379) 
* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name
 2016-05-19 16:31:41 -06:00
rallytime
35ad788470 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - conf/minion
  - doc/ref/configuration/minion.rst
  - salt/modules/boto_elb.py
  - salt/modules/sudo.py
  - salt/states/boto_elb.py
  - salt/transport/zeromq.py
 2016-05-19 16:22:36 -06:00
rallytime
8ef7697806 Merge branch '2015.5' into '2015.8' 
No conflicts.
 2016-05-19 16:00:35 -06:00
Mike Place
2b5ad128bf Better YAML syntax error handling (#33375) 
Closes #26574
 2016-05-19 15:56:45 -06:00
Nicole Thomas
38fbcf865f Add note about name parameter in git_pillar docs (#33369) 
Fixes #27737
 2016-05-19 13:14:14 -07:00
Nicole Thomas
49251993ff Add win_pkg to list of modules that support "version" in pkg.installed (#33362) 
Fixes #32913
 2016-05-19 13:13:57 -07:00
Nicole Thomas
7a400a9499 Add note to docs about api settings for Hipchat API v2 (#33365) 
Fixes #27779
 2016-05-19 13:13:10 -07: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
Denys Havrysh
37e1930b6e Add initscripts, SystemD service units and environment files for Debian (#32857) 2016-05-19 13:10:02 -07:00
jacobhammons
bb3e98cad2 Merge pull request #33372 from jacobhammons/release-update 
revved 2015.8 branch to .9 in version selector
 2016-05-19 14:05:35 -06:00
Jacob Hammons
5ce502160b revved 2015.8 branch to .9 in version selector 2016-05-19 14:04:26 -06:00
jacobhammons
80f52a658e Merge pull request #33370 from jacobhammons/2015.8.9 
Update docs version to 2015.8.9
 2016-05-19 13:59:15 -06:00
Nicole Thomas
3e5689abbf Merge pull request #33366 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-05-19 13:41:40 -06:00
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
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