Commit Graph

25189 Commits

Author SHA1 Message Date
Peter Baumgartner
9b61d0e6ab Adds info on status module 2014-01-29 14:23:42 -07:00
Peter Baumgartner
4c515558cf Adds Nginx status module 2014-01-29 14:17:43 -07:00
Thomas S Hatch
10304c296b Fix lint per #10020 2014-01-29 08:59:35 -07:00
Thomas S Hatch
2106775c6e Merge pull request #10020 from felskrone/added_minions_denied_to_pki
denied minions keys are written to $pki_dir/minions_denied
2014-01-29 07:57:50 -08:00
Thomas S Hatch
ae16ed9c58 Merge pull request #10019 from galet/file-extract-hash-tests
Added test for salt.modules.file.extract_hash() to verify support for simple Maven checksum file format
2014-01-29 07:50:15 -08:00
Thomas S Hatch
b88291bb70 Merge pull request #10014 from sabaini/develop
cobbler ext_pillar params should be a dict
2014-01-29 07:47:53 -08:00
Thomas S Hatch
6604bfffc8 Merge pull request #10013 from bretep/develop
Add ability to subfilter in sls files
2014-01-29 07:46:22 -08:00
Thomas S Hatch
94a6b01522 Merge pull request #10011 from makinacorpus/fix10010
display full jinja traceback when applicable
2014-01-29 07:41:29 -08:00
Thomas S Hatch
759db9d08f Merge pull request #10009 from bigkraig/defaults-fix
Fixing defaults.py for 2014.1rc3
2014-01-29 07:40:35 -08:00
Thomas S Hatch
2693b4d1e6 Merge pull request #10008 from mgwilliams/runner-docs
make "salt-run -d" limit to the specific runner or function, if provided
2014-01-29 07:38:48 -08:00
Thomas S Hatch
61464e31a3 Merge pull request #10001 from mgwilliams/virt
virt runner: delete key from master when VM is purged
2014-01-29 07:34:01 -08:00
Thomas S Hatch
3b1a45985b Merge pull request #9999 from cachedout/catch_bad_args
Catch bad args in salt-call
2014-01-29 07:33:41 -08:00
Thomas S Hatch
e46e655b2b Merge pull request #9994 from terminalmage/issue9903
Fix ref to changed parameter name in file.stats
2014-01-29 07:33:09 -08:00
Thomas S Hatch
ec963d2dd9 Merge pull request #9989 from regilero/develop
Doc: fix grains.filter_by example on default argument usage
2014-01-29 07:29:50 -08:00
Thomas S Hatch
cd84a159f0 Merge pull request #9988 from makinacorpus/handleerror
Handle better state errors
2014-01-29 07:29:11 -08:00
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
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