Seth House
79ad988fef
Fleshed out the Python API docs
2013-12-19 21:40:43 -07:00
Seth House
f051ad477c
Added CloudClient to the Python API docs
2013-12-19 21:40:34 -07:00
Thomas S Hatch
09c76f9a13
Merge pull request #9337 from tkwilliams/salt-thin-fixes
...
Initial working code to support specifying additional modules to include into a thin.tgz (think mako :)
2013-12-19 09:00:40 -08:00
Thomas S Hatch
0d793a1eb0
Merge pull request #9329 from terminalmage/issue9061
...
Allow '_in' requisites to match both on ID and name
2013-12-19 08:57:12 -08:00
Thomas S Hatch
eeef67d144
Merge pull request #9309 from terminalmage/issue9234
...
Improve reporting for errors caching binary packages
2013-12-19 08:53:02 -08:00
Thomas S Hatch
7fbe83a8bb
Merge pull request #9305 from s0undt3ch/hotfix/missing-exsel-keyerror-2
...
`exsel` matching is no longer supported
2013-12-19 08:51:48 -08:00
Thomas S Hatch
ebc07e8080
Merge pull request #9299 from vahidden/develop
...
Fixes pillar namespace merging not preserving order when replacing keys
2013-12-19 08:51:11 -08:00
Thomas S Hatch
ab012ddf9f
Merge pull request #9291 from jesusaurus/grep/available
...
Don't assume that grep-available is available
2013-12-19 07:55:55 -08:00
Pedro Algarvio
22ff30b2e3
Merge pull request #9352 from gravyboat/develop
...
Updated targeting docs and prepared FAQ for some new pages.
2013-12-19 00:02:40 -08:00
Forrest Alvarez
9429458ff9
updated globbing docs with an extra example
2013-12-19 06:23:00 +00:00
Forrest Alvarez
ac496b223f
Merge remote branch 'upstream/develop' into develop
2013-12-19 06:21:28 +00:00
Joseph Hall
9134f4fd77
Merge pull request #9349 from techhat/nova
...
Add avail_locations() to nova driver
2013-12-18 20:03:35 -08:00
Joseph Hall
a1c311501b
Add avail_locations() to nova driver
2013-12-18 21:02:56 -07:00
Pedro Algarvio
4475880f2a
Merge pull request #9338 from terminalmage/issue9232
...
Suppress tracebacks in states which manage files
2013-12-18 16:14:59 -08:00
Colton Myers
640e683ced
Merge pull request #9345 from basepi/typo9195
...
Fix typo from #9195
2013-12-18 14:47:15 -08:00
Colton Myers
5d92ee828d
Fix typo from #9195
2013-12-18 15:46:46 -07:00
Seth House
0890a13d7d
Merge pull request #9339 from basepi/slsvars9261
...
Document availability of templating variables, Fix #9261
2013-12-18 14:39:40 -08:00
Colton Myers
d61a93fde5
Document availability of templating variables, Fix #9261
2013-12-18 11:13:21 -07:00
Erik Johnson
e6e0ce2735
Suppress tracebacks in states which manage files
...
This captures exceptions encountered in states that run file.get_managed
or file.manage_file, suppressing the traceback and instead returning a
False result for the state, with a meaningful error message.
2013-12-18 11:55:46 -06:00
Pedro Algarvio
8034d126e2
Merge pull request #9335 from cachedout/ps-unit-tests
...
Correct failure when psutil is not installed. Also some minor reformatting.
2013-12-18 08:36:38 -08:00
Tom Williams
834ae3ecbb
Initial working code to support specifying additional modules to include in a thin.tgz (think mako :)
...
Add an "overwrite" arg to force creation of a tarball even if the version number is the same
2013-12-18 08:35:21 -08:00
Mike Place
bd2ec30682
Correct failure when psutil is not installed.
...
Reformatting.
2013-12-18 09:25:04 -07:00
Pedro Algarvio
b9aeb5ad8e
White-space related lint fixes.
2013-12-18 09:38:39 +00:00
Pedro Algarvio
1d2823d925
Fix Pylint W0105, string statement has not effect
2013-12-18 09:38:38 +00:00
Pedro Algarvio
8e6366daac
Merge pull request #9315 from shish/patch-1
...
Look for crontabs in /usr/lib/cron/tabs when on MacOS
2013-12-18 01:28:14 -08:00
Pedro Algarvio
c1107f22fe
Merge pull request #9330 from cachedout/ps-unit-tests
...
Unit testing cron exec module.
2013-12-17 16:25:51 -08:00
Mike Place
d8facc96a4
Unit testing cron exec module.
2013-12-17 15:59:57 -07:00
Erik Johnson
2dfd89af3d
Allow '_in' requisites to match both on ID and name
...
Under the hood, all '_in' requisites are changed to extends of their
corresponding type. For example, a require_in for a given state extends
the target of the require_in with a 'require' requisite, pointing back
at the state where the require_in was located.
When these extends are reconciled, only the ID declarations are examined
to see if there is a state matching the requisite's target, meaning that
these '_in' requisites cannot point to a 'name' override in the same way
as their counterparts are able to. For more info, see
https://github.com/saltstack/salt/issues/9061 .
This commit modifies the extend reconciliation behavior. If there is no
ID declaration matching the requisite's target, then
salt.state.find_name() is used to search the high data for an ID
declaration with a 'name' param matching the requisite target. If a
match is found, then the extend is reconciled against that matching ID.
If no match is found, then the requisite is not found the appropriate
error is returned.
2013-12-17 16:38:49 -06:00
Colton Myers
5b4d47fb10
Merge pull request #9320 from cachedout/ps-unit-tests
...
More ps exec module unit tests.
2013-12-17 14:11:29 -08:00
Thomas S Hatch
9c9c37eb06
Merge pull request #9328 from KB1JWQ/fixpingtypo
...
Changed ping to test as per Tom yelling at me in Salt Class
2013-12-17 14:10:08 -08:00
Colton Myers
8ab8b76f6d
Merge pull request #9327 from corywright/issue9325
...
Issue9325
2013-12-17 14:08:16 -08:00
Corey Quinn
58ac57c6af
Fixed ping to test as per Tom yelling at me in Salt Class
2013-12-17 14:07:37 -08:00
Joseph Hall
8d8b7443c3
Merge pull request #9326 from UtahDave/develop
...
use log.debug like all the other cloud drivers.
2013-12-17 13:51:01 -08:00
Cory Wright
c42e92612f
Merge branch 'issue9325' of github.com:corywright/salt into issue9325
2013-12-17 16:46:41 -05:00
Cory Wright
4df93d9813
Note that the force_yes parameter to install was added to apt.py in 0.17.4
...
Fixes issue #9325
2013-12-17 16:45:21 -05:00
Cory Wright
e9081751fc
Note that the force_yes parameter to install was added to apt.py in 0.17.4
2013-12-17 16:44:40 -05:00
David Boucha
b68ef4e4e1
use log.debug like all the other cloud drivers.
...
This will cause the cli to not display the message that AWS is
not configured. This was confusing to users who are using the EC2
driver and get a message that AWS was not configured.
2013-12-17 14:43:46 -07:00
Mike Place
d7b7ad3b9f
More ps exec module unit tests.
2013-12-17 11:23:49 -07:00
Joseph Hall
c48b1eacc7
Images can be obtained from nova instead of glance
2013-12-17 09:55:57 -07:00
Shish
b71237f817
Look for crontabs in /usr/lib/cron/tabs when on MacOS
2013-12-17 12:50:34 +00:00
Pedro Algarvio
1aeec5b2c7
Merge pull request #9310 from makinacorpus/fix-invmode
...
Fix invmode
2013-12-16 19:52:54 -08:00
Mathieu Le Marec - Pasquet
bb7f5247d3
according buildout tests
2013-12-17 04:36:36 +01:00
Erik Johnson
0b30626195
Improve reporting for errors caching binary packages
...
This commit catches MinionError exceptions encountered when caching
remote binary packages. In execution functions, a CLI-friendly
CommandExecutionError is raised. In states, a False outcome is returned
with a meaningful error message.
2013-12-16 20:25:58 -06:00
Mathieu Le Marec - Pasquet
c6d8843835
inversion in buildout modes
2013-12-17 03:06:08 +01:00
Pedro Algarvio
68d7cc074b
exsel matching is no longer supported.
2013-12-17 01:01:49 +00:00
Pedro Algarvio
2b28bbfc02
Merge pull request #9298 from terminalmage/refactor-yumpkg-multiarch
...
Refactor yumpkg5 arch handling
2013-12-16 16:32:27 -08:00
Pedro Algarvio
9e3635995f
Merge pull request #9303 from cachedout/ps-unit-tests
...
Ps unit tests
2013-12-16 16:25:42 -08:00
Mike Place
20ab5b2d23
Lint.
2013-12-16 17:09:49 -07:00
Mike Place
26aa30393e
Unit testing of ps exec module.
...
Seemed like this would be sort of mundane but there are actually a few dragons here.
Unit testing turned up the fact that we make use of methods in psutil that are deprecated!
2013-12-16 17:05:53 -07:00
Vahid Hamidullah
746d6a1897
Remove trailing semicolons from previous commit
2013-12-16 16:55:59 -05:00
