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
25,225 Commits 24 Branches 182 Tags 341 MiB
1edaf7c345
Commit Graph

25225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
6029515fd0 Merge pull request #9985 from makinacorpus/graindirs 
Custom grains directories
 2014-01-29 07:25:28 -08:00
Thomas S Hatch
5e833b93cb Merge pull request #9972 from s0undt3ch/hotfix/future-print-function 
future print function lint fixes
 2014-01-29 07:23:25 -08:00
vs
6053d5176c denied minions keys are written to $pki_dir/minions_denied 2014-01-29 15:44:27 +01:00
Joseph Hall
e0a67ddb0e Merge pull request #10005 from bigkraig/develop 
Fixing --to-destination parameter to iptables, which needs to be placed after the jump.
 2014-01-29 05:04:55 -08:00
Michal Galet
7394c2fd2a Added test for salt.modules.file.extract_hash() to verify support for simple Maven checksum file format. 2014-01-29 11:57:47 +00:00
Pedro Algarvio
52a69e39e3 Merge pull request #10016 from makinacorpus/pgsql 
postgres: small fix: arg left from pylint cleanup
 2014-01-29 03:18:59 -08:00
Mathieu Le Marec - Pasquet
3e986977ef postgres: small fix: arg left from pylint cleanup 2014-01-29 11:00:31 +01:00
Peter Sabaini
118b1caf1d doc of params fixed 2014-01-29 09:42:20 +01:00
Bret Palsson
3f8f99f7ae Add ability to subfilter in sls files 
This will recurse through the sls when matching the minion.

It will only recurse on the special key: subfilter

Why subfilters? There a few benefits. Notice in the example below
the top most filter is environment specific. All the sub filters can
be copied, as is, beneath any filter. No more writing '*dev*web*front'
anymore.

For further documentation on why this was added:
Please see issue saltstack/salt#9979

Here is an example sls:

```yaml
dev:
  '*dev*':
    - sqlite
    - subfilter:
        '*webserver*':
          - nginx
prod:
  '*prod*':
    - stunnle
    - subfilter:
        '*webserver*':
          - newrelic-agent
          - subfilter:
              '*front':
                - haproxy
              '*back':
                - nginx
                - statsd
```
 2014-01-28 22:36:56 -07:00
dan
46c275b771 The code or schedule had a better example than the doc. 2014-01-29 00:06:08 -05:00
Mathieu Le Marec - Pasquet
a6b3bf4167 Lint fix 2014-01-29 02:43:19 +01:00
Mathieu Le Marec - Pasquet
688abda402 display full jinja traceback when applicable 
This fixes #10010
 2014-01-29 02:04:12 +01:00
Pedro Algarvio
a9b4215cd9 Merge pull request #10007 from rgbkrk/patch-3 
Delete crate.io out of PyPI mirrors
 2014-01-28 16:32:34 -08:00
Kraig Amador
18ccf04952 Fixes a problem in 2014.1 where context can be a jinja2.runtime.Context and not a dictionary. 2014.1 also no longer stores the sls name in the sls argument, but it can be found in mods. 
Alternatively, if the sls name and template path could be added to the context, this would be a whole lot easier.
 2014-01-28 16:12:30 -08:00
Kyle Kelley
e93e2fdf0d Toss all mirrors 
7 years bad luck
 2014-01-28 16:58:37 -07:00
Kyle Kelley
67f93796b9 Delete crate.io 2014-01-28 16:26:26 -07:00
Matthew Williams
b15a507e15 salt-run: make help for --doc consistent 2014-01-28 17:11:38 -05:00
Matthew Williams
dd459c43eb make "salte-run -d" limit to the specific runner or function, if provided 2014-01-28 17:07:33 -05:00
Kraig Amador
ad949332e6 Fixing --to-destination parameter to iptables, which needs to be placed after the jump. 2014-01-28 13:47:06 -08:00
Seth House
7b50bd1352 Added cmd_batch to Python API documentation 2014-01-28 12:35:02 -07:00
Matthew Williams
29c78f64b2 virt runner: delete key from master when VM is purged 2014-01-28 14:19:49 -05:00
Mike Place
da0b85dcb3 Catch bad args in salt-call 
Instead of throwing an ugly stack trace, catch a type error, format the exception and display it. Then exit with a proper retcode.
 2014-01-28 11:54:31 -07:00
Pedro Algarvio
396abb06eb Merge pull request #9993 from terminalmage/issue9919 
Fix variable scope issue
 2014-01-28 09:00:21 -08:00
Erik Johnson
2b8953adcb Fix ref to changed parameter name in file.stats 
A few weeks ago in 7d4c470, the argument name "follow_symlink" was
changed for consisency with the rest of the functions in the "file"
execution module. This commit fixes a missed ref to the file.stats
function.
 2014-01-28 09:46:04 -07:00
Erik Johnson
1e6e87f1f5 Fix variable scope issue 
Resolves #9919.
 2014-01-28 09:38:02 -07:00
Mike Place
2649cbc848 Merge pull request #9990 from Lothiraldan/feature/States.file.accumulated_docstring 
Fix states.file.accumulated docstring
 2014-01-28 08:09:03 -08:00
FELD Boris
1134568540 Fix states.file.accumulated docstring 2014-01-28 16:19:36 +01:00
regilero
959e7939f7 Doc: fix grains.filter_by example on default argument usage 2014-01-28 16:19:32 +01:00
Mathieu Le Marec - Pasquet
165b5e4af2 Handle better state errors 
This fixes #9983.
 2014-01-28 16:01:34 +01:00
Pedro Algarvio
6db9fa9ab5 Merge pull request #9976 from terminalmage/packaging 
Update RPM spec for 0.17.5
 2014-01-28 05:59:58 -08:00
Mathieu Le Marec - Pasquet
11ff89000b Custom grains directories 2014-01-28 13:40:55 +01:00
Seth House
cb65f44864 Merge pull request #9980 from gravyboat/develop 
Updated requisite docs to try and clarify issues regarding the difference between requisite, and requisite_in.
 2014-01-27 20:38:53 -08:00
Forrest Alvarez
db01d53d53 Updated requisite docs to try and clarify issues regarding the difference between requisite, and requisite_in. 2014-01-28 04:31:25 +00:00
Erik Johnson
708a95ddf4 Update RPM spec for 0.17.5 2014-01-27 15:54:26 -06:00
Thomas S Hatch
1a9ae90984 Spelling is not always my strong suit :P 2014-01-27 13:06:22 -07:00
Thomas S Hatch
4fd5512685 clean out extra whitespace 2014-01-27 10:30:45 -07:00
Thomas S Hatch
7b635a50f7 Merge pull request #9970 from s0undt3ch/hotfix/unnecessary-parens 
Fix unnecessary parens for if, not, return
 2014-01-27 09:05:15 -08:00
Pedro Algarvio
d53917d2bb Fix "Unnecessary parens after 'print' keyword" lint issues. 2014-01-27 17:04:33 +00:00
Pedro Algarvio
4b3923ce95 Use the print() function. 2014-01-27 17:04:33 +00:00
Thomas S Hatch
2a1a46edc9 Merge pull request #9971 from basepi/0.17.5release 
0.17.5 release notes
 2014-01-27 09:01:46 -08:00
Colton Myers
3f8799a334 Update current release in docs 2014-01-27 10:00:26 -07:00
Colton Myers
782c5dc944 Add 0.17.5 release notes 2014-01-27 09:59:57 -07:00
Pedro Algarvio
0f63866c69 Fix all unnecessary parens after if, not, return, etc, keywords. 2014-01-27 16:58:18 +00:00
Thomas S Hatch
3d94b7ea88 Merge pull request #9947 from sbdelisle/develop 
I realized that the coercion to oct string I did was incorrect.
 2014-01-26 19:55:52 -08:00
Joseph Hall
75c2bd46b4 As stupid of a rule as it is, "modeled" is correct 2014-01-26 20:20:28 -07:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi 
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
 2014-01-26 18:41:28 -08:00
Thomas S Hatch
a2c1833458 Merge pull request #9957 from s0undt3ch/develop 
Update to latest bootstrap script. v1.5.11
 2014-01-26 12:03:34 -08:00
Pedro Algarvio
81d69571cb Update to latest bootstrap script. v1.5.11 2014-01-26 17:58:21 +00:00
Joseph Hall
53d15e2edc Merge pull request #9953 from terminalmage/docs 
Fix bad rst link refs
 2014-01-26 06:08:49 -08:00
Erik Johnson
cad5485d9f Fix bad rst link refs 2014-01-26 05:37:16 -06:00