valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,693 Commits 24 Branches 182 Tags 341 MiB
ab61f78295
Commit Graph

59693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
ab61f78295 Merge pull request #29775 from lyft/listen-id-declaration-resolution-stable 
Change listen requisite resolution from name to ID declaration
 2015-12-16 15:56:03 -07:00
Paul Fisher
ff3a809c11 Change listen requisite resolution from name to ID declaration 2015-12-16 13:54:49 -08:00
Mike Place
5af64b64f2 Merge pull request #29754 from rallytime/bp-29719 
Back-port #29719 to 2015.8
 2015-12-16 10:25:50 -07:00
gqgunhed
ed275977e3 fixed: include all items from kern.disks split 
salt['grains.get']('disks') always dropped the last disk (first in returned list from sysctl).
"sysctl -n" does not include sysctl-name, so the [1:] offset was wrong.
 2015-12-16 09:26:30 -07:00
Mike Place
b3f17fdaf8 Merge pull request #29713 from The-Loeki/patch-1 
Pillar-based cloud providers still forcing use of deprecated 'provider'
 2015-12-16 07:51:31 -07:00
Mike Place
1f4810be0f Merge pull request #29729 from rallytime/fix-14634 
Further clarifications on "unless" and "onlyif" requisites.
 2015-12-16 07:45:06 -07:00
Mike Place
7084f79199 Merge pull request #29737 from akissa/fix-pillar-sqlite3-examples 
fix pillar sqlite3 documentation examples
 2015-12-16 07:41:57 -07:00
Mike Place
e977096409 Merge pull request #29743 from akissa/fix-pillar-sqlite3-does-not-honour-config 
fix pillar sqlite not honouring config options
 2015-12-16 07:40:27 -07:00
Andrew Colin Kissa
6184fb1ae1 fix pillar sqlite not honouring config options 
Fixes #29741
 2015-12-16 14:20:16 +02:00
Andrew Colin Kissa
1c98f8d609 fix pillar sqlite3 documentation examples 
Fixes #29736
 2015-12-16 12:58:26 +02:00
Ronald van Zantvoort
35fe2a5c18 lint fix 2015-12-16 02:02:11 +01:00
Mike Place
2cea0b0a2d Merge pull request #29723 from rallytime/fix-29152 
Clarify db_user and db_password kwargs for postgres_user.present state function
 2015-12-15 16:58:43 -07:00
Mike Place
30eab23c43 Merge pull request #29722 from rallytime/fix-29154 
Link "stateful" kwargs to definition of what "stateful" means for cmd state.
 2015-12-15 16:25:47 -07:00
rallytime
45b77fb288 Add note about shell truthiness vs python truthiness 2015-12-15 16:14:31 -07:00
Mike Place
c9ca1a371e Merge pull request #29724 from rallytime/fix-29091 
Add examples of using multiple matching levels to Pillar docs
 2015-12-15 16:02:32 -07:00
rallytime
3bfb87c031 Spelling fixes 2015-12-15 15:45:19 -07:00
rallytime
15c466cc12 Further clarifications on "unless" and "onlyif" requisites. 
Fixes #14634

- "unless" is actually a NAND operator
- remove usage of "opposite of unless" as that is confusing
 2015-12-15 15:42:56 -07:00
Mike Place
4985cc57f1 Merge pull request #29726 from cachedout/disable_moto_2015_8 
Disable some boto tests per resolution of moto issue
 2015-12-15 15:15:35 -07:00
Mike Place
d19827fd3a Disable some boto tests per resolution of moto issue 
Pending resolution of https://github.com/spulec/moto/issues/493
 2015-12-15 14:59:14 -07:00
rallytime
45080f3629 Add examples of using multiple matching levels to Pillar docs 
Fixes #29091
 2015-12-15 14:57:36 -07:00
rallytime
8d8fdd0a27 Clarify db_user and db_password kwargs for postgres_user.present state function 
Fixes #29152
 2015-12-15 14:31:02 -07:00
rallytime
5c045a86af Link "stateful" kwargs to definition of what "stateful" means for cmd state. 
Fixes #29154
 2015-12-15 14:21:58 -07:00
Mike Place
aba82abffd Merge pull request #29708 from lagesag/fix-file-directory-test-mode 
Fix test=True for file.directory with recurse ignore_files/ignore_dirs.
 2015-12-15 12:15:14 -07:00
Mike Place
7c38dec0ad Merge pull request #29642 from cachedout/issue_29199 
Correctly restart deamonized minions on failure
 2015-12-15 12:02:40 -07:00
Mike Place
bd918394c3 Merge pull request #29599 from cachedout/clean_minion_shutdown 
Clean up minion shutdown
 2015-12-15 12:01:34 -07:00
Mike Place
31eb291caf Merge pull request #29675 from clinta/git-ls-remote-noref 
allow returning all refs
 2015-12-15 11:55:36 -07:00
Mike Place
7c50533d3f Merge pull request #29683 from rallytime/vsan_fixes 
Catch more specific error to pass the error message through elegantly.
 2015-12-15 11:41:54 -07:00
Mike Place
30499e4896 Merge pull request #29687 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-12-15 11:38:46 -07:00
Mike Place
3c427e82bf Merge pull request #29681 from clinta/git-mirror 
fix bare/mirror in git.latest
 2015-12-15 11:37:16 -07:00
Ronald van Zantvoort
dfab6f8186 Update __init__.py 2015-12-15 18:41:55 +01:00
Ronald van Zantvoort
65e2d9ac1e Pillar-based cloud providers still forcing use of deprecated 'provider' 
Similar to #27953
 2015-12-15 18:38:00 +01:00
Piotr Cwiek
a872b5eecf PyLint fix #25723 2015-12-15 17:30:43 +01:00
Piotr Cwiek
3e46cb9213 Fix test=True for file.directory with recurse ignore_files/ignore_dirs. 
Fixes #25723.

Cause: _check_directory() failed to implement "ingore_files" and
"ignore_dirs" as valid options in "recurse" for directory() state.

Changes:

* New _RECURSE_TYPE const lists possible values for "recurse" list.
* New _get_recurse_set() function validates "recurse". Raises TypeError
  or ValueError and returns a set of strings.
* directory() (test=False) uses _get_recurse_set().
* _check_directory() (test=True) uses _get_recurse_set().
* _check_directory() takes "ignore_files" and "ignore_dirs" into account
  when recursively investigating a directory.

Additional change: _check_directory() always checks the root directory
(specified in "name"). Previously it was skipped when "recurse" was enabled.
 2015-12-15 15:25:55 +01:00
Colton Myers
b51cba59c0 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-12-14 15:44:21 -07:00
rallytime
afc003079e Catch more specifc error to pass the error message through elegantly. 2015-12-14 12:04:53 -07:00
Clint Armstrong
f8c34b0c76 version updated 2015-12-14 13:55:57 -05:00
Clint Armstrong
b387072a6f fix bare/mirror in git.latest 2015-12-14 13:53:00 -05:00
Mike Place
fe0778dad5 Merge pull request #29644 from rallytime/esxi-fixes 
Fixed a couple more ESXi proxy minion bugs
 2015-12-14 11:36:28 -07:00
Mike Place
ef2c9e3f61 Merge pull request #29645 from rallytime/bp-29558 
Back-port #29558 to 2015.8
 2015-12-14 11:11:38 -07:00
Mike Place
f606c23ea8 Merge pull request #29673 from rallytime/fix-29661 
Default value should be False and not 'False'
 2015-12-14 11:08:44 -07:00
Clint Armstrong
73b169e7dd lint, remove trainling whitespace 2015-12-14 12:51:01 -05:00
Clint Armstrong
8400e68426 allow returning all refs 2015-12-14 11:49:24 -05:00
rallytime
e4af7a1157 Default value should be False and not 'False' 
If default is a string, then "if x" statements will be True, not False.
 2015-12-14 09:10:39 -07:00
Ruxandra Burtica
2cf9374342 Replaced tabs with spaces. 2015-12-11 16:45:38 -07:00
Ruxandra Burtica
5e7e3fe682 Returning security group when no VPC id is given, even if the group is not in EC2-classic. 2015-12-11 16:45:38 -07:00
Mike Place
8b2c6817cf Sleep before restart 2015-12-11 16:17:35 -07:00
rallytime
577d5487a3 Fixed a couple more ESXi proxy minion bugs 
- Don't log the salt.utils.vmware.esxcli command (shouldn't log password)
- Make sure we catch all ssh key changes possibilities in esxi state
- Provide a use-case example of why using a list of passwords for the host is a useful idea
 2015-12-11 16:16:25 -07:00
Mike Place
4105e2abfb Correctly restart deamonized minions on failure 
Closes #29199
 2015-12-11 14:45:00 -07:00
Mike Place
a2a7f1527b Merge pull request #29632 from jfindlay/tls_virt 
reduce severity of tls module __virtual__ logging
 2015-12-11 13:11:32 -07:00
Mike Place
0b917971fe Log at debug level instead 2015-12-11 13:03:04 -07:00