valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
19,843 Commits 24 Branches 182 Tags 341 MiB
4f00fa256b
Commit Graph

19843 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
88c3cb3d6d Merge pull request #8197 from s0undt3ch/develop 
Moved test cases from #8195 to a better place.
 2013-10-31 21:02:05 -07:00
Erik Johnson
11ee417289 Workaround bug in yum python API 
This works around a bug in the yum python API where removal of packages
that are required by other packages results in the removal of those
packages as well, and does not raise an exception when errors are
encountered during the transaction test, causing all packages to be
removed.

This commit manually performs the transaction test, and raises an
exception if any errors are found. It also adds a try/except to the
pkg.removed and pkg.purged states which catches the exception and
gracefully returns False without a traceback.

See https://github.com/saltstack/salt/issues/8201 for more information.
 2013-10-31 18:23:06 -05:00
Mike Place
2807b9412e PEP8 and correct opts dict. 2013-10-31 17:19:06 -06:00
Mike Place
459feb70f3 Provide a configuration switch to enable limited directory traversal. 2013-10-31 17:07:02 -06:00
C. R. Oldham
5c0ff99322 Merge pull request #8202 from cro/fix-4410-again 
Back out earlier fix.
 2013-10-31 16:06:48 -07:00
C. R. Oldham
8e53d5ff80 Back out earlier fix. 2013-10-31 17:04:58 -06:00
Mike Place
562bed8fec Modify list_states to accept an option to perform a top-down search and to cease traversal after encountering a directory without a SLS file present. 2013-10-31 15:53:11 -06:00
Colton Myers
c67ecff2bd Merge pull request #8193 from jcsp/verify-fix 
Improve error reporting from verify_files
 2013-10-31 12:14:30 -07:00
Pedro Algarvio
c849c4b57f Moved test cases from #8195 to a better place. 2013-10-31 18:54:25 +00:00
Pedro Algarvio
245ebd120f Merge pull request #8187 from terminalmage/issue8156 
Make newly-added repo available to pkg states
 2013-10-31 09:50:47 -07:00
Pedro Algarvio
9faece88e5 Merge pull request #8195 from regilero/develop 
Integration tests for  sls syntax errors
 2013-10-31 09:21:31 -07:00
Thomas S Hatch
57210ce64a Pass in a starting indent for the nested outputter 2013-10-31 09:48:34 -06:00
Thomas S Hatch
24193ea7b3 Allow a nested default to be passed in opts to start the 
nested outputter in a deeper structure
 2013-10-31 09:48:34 -06:00
Thomas S Hatch
d3b63c09d3 Pass in CYAN to the nested outputter for changes output 2013-10-31 09:48:34 -06:00
Thomas S Hatch
5276f25901 Allow a string definition to be passed into get_colors 
This allows for an outputter to send a washout color for all output
 2013-10-31 09:48:34 -06:00
Thomas S Hatch
cfca63a78d Use the nested outputter for changes in highstate display 2013-10-31 09:48:34 -06:00
regilero
95e5ce6033 Merge remote-tracking branch 'upstream/develop' into develop 2013-10-31 14:33:13 +01:00
regilero
089787cead Integration tests for #8174, #7905 & #8114: sls syntax errors 2013-10-31 14:30:25 +01:00
Pedro Algarvio
c584362b1a Merge pull request #8186 from terminalmage/issue7696 
Fix for managing debian repos with trailing slashes in the URI
 2013-10-31 03:12:35 -07:00
Joseph Hall
ac18f8836a Merge pull request #8185 from c-cooperjones/develop 
Ammended iptables check if statement was mis-tabbed.
 2013-10-30 19:42:40 -07:00
Erik Johnson
5a952863ce Make newly-added repo available to pkg states 
If a package is added using a pkgrepo.managed state, and a pkg.installed
state needs access to this newly-added repo, it will not be able to find
the package since the pkg.refresh_db happens in the call to pkg.install
(just prior to the package installation), and not when the package
targets are initially looked for. This commit adds a pkg.refresh_db
before the targets are checked, and then supresses the refresh_db when
the package is actually installed (because at that point, it would be
redundant).
 2013-10-30 20:03:04 -05:00
Erik Johnson
1751e80145 Fix for managing debian repos with trailing slashes in the URI 
This commit modifies apt.py's expand_repo_def and list_repos (as well as
get_repo, as it uses list_repos) functions to strip the trailing slash.
This allows for repo definitions to be created with trailing slashes,
and for a trailing slash to not result in a failure to match a repo.

Additionally, this commit has fixes for generic "raise Exception" usage,
instead using salt.exceptions.CommandExecutionError as it avoids
tracebacks in the CLI output.

Finally, some manual quoting has been converted to using raw strings.
 2013-10-30 18:10:57 -05:00
root
22fb6d6197 Ammended iptables check if statement was mis-tabbed. 2013-10-30 20:16:49 +00:00
Joseph Hall
f957f9a800 Merge pull request #8183 from s0undt3ch/develop 
Fix the Halite tutorial code blocks under configuration.
 2013-10-30 12:28:04 -07:00
Pedro Algarvio
6d543dcf4f Fix the Halite tutorial code blocks under configuration. 2013-10-30 19:21:21 +00:00
Pedro Algarvio
b997491161 Merge pull request #8182 from bretep/patch-1 
libevent-dev required to pip install gevent
 2013-10-30 12:19:12 -07:00
Bret Palsson
c9fdfb7574 libevent-dev required to pip install gevent 2013-10-30 13:11:28 -06:00
Joseph Hall
b0e03b6803 Merge pull request #8181 from mgwilliams/ddns 
ddns: ensure name is str
 2013-10-30 11:40:33 -07:00
Matthew Williams
da3fc71a2d ddns: ensure name is str 2013-10-30 18:35:33 +00:00
Colton Myers
5f63f2265e Merge pull request #8179 from cachedout/#8163 
Change the check for git rev-parse to fail if the SHA is not found. Refs...
 2013-10-30 11:10:29 -07:00
Colton Myers
4717b435df Merge pull request #8174 from regilero/develop 
fix 'OrderedDict' object has no attribute 'append' stack trace in _handle_iorder in case of syntax error
 2013-10-30 10:58:27 -07:00
Mike Place
51d18a495e Change the check for git rev-parse to fail if the SHA is not found. Refs #8163. 2013-10-30 11:53:52 -06:00
John Spray
e9f49a462f Improve error reporting from verify_files 
Make it similar to what verify_env already does, so that
we tell people exactly which path was a problem.  I hit this
while running salt-master in a non-standard configuration, and
the change makes it easier to hunt down which path is wrong
in a config.
 2013-10-30 17:12:58 +00:00
Seth House
fd59d9df39 Revert "Removed links to Dash docs until feeds are fixed" 
This reverts commit 197ffa1b05.

Dash feeds are working! Refs #5839
 2013-10-30 11:00:31 -06:00
regilero
1def8741db fix 'OrderedDict' object has no attribute 'append' stack trace in _handle_iorder in case of syntax error 2013-10-30 09:44:32 +01:00
Thomas S Hatch
b821f6a174 Merge pull request #8172 from s0undt3ch/develop 
Don't even try to parse a version string if it's not a **Salt** git checkout
 2013-10-29 17:34:17 -07:00
Pedro Algarvio
9291c36760 Don't even try to parse a version string if it's not a **Salt** git checkout. Fixes #8090. 2013-10-30 00:16:21 +00:00
Thomas S Hatch
b4abfc3fcb Merge pull request #8171 from terminalmage/windows-opts-test-issue 
Work around windows multiprocessing bug
 2013-10-29 16:34:51 -07:00
Thomas S Hatch
c25f411690 Merge pull request #8170 from cachedout/ssh-args-hotfix 
Fix logic for cmd_block.
 2013-10-29 16:15:32 -07:00
Mike Place
cc97ce649a Fix logic for cmd_block. 2013-10-29 17:13:49 -06:00
Erik Johnson
b433d0368f Work around windows multiprocessing bug 
Set __opts__['test'] back to it's prior value at the end of the various
functions in salt.modules.state which use it.
 2013-10-29 17:53:04 -05:00
Thomas S Hatch
cd2b161ac8 Merge pull request #8161 from halfgaar/develop 
Added : to xen grep, because otherwise it would match kernel messages li...
 2013-10-29 15:36:17 -07:00
Thomas S Hatch
561659036c Merge pull request #8120 from davidjb/develop 
Allow noarch packages to be found for yum installation.
 2013-10-29 15:35:13 -07:00
Thomas S Hatch
b5960da8a6 Merge pull request #8106 from zeezooz/fix_mine_timeout 
Use non-zero timeout in mine.update method and don't ignore exceptions.
 2013-10-29 15:22:32 -07:00
Thomas S Hatch
b04f9c4ae2 Merge pull request #8160 from johnnoone/hide-with-statement-warnings 
Hide with-statements warnings
 2013-10-29 13:58:23 -07:00
Colton Myers
a29bb6128e Merge pull request #8154 from gravyboat/develop 
An additional example, and details on the template option for file.recurse.
 2013-10-29 12:32:22 -07:00
Colton Myers
b98f5f4acd Merge pull request #8147 from terminalmage/docs 
Improve git_pillar docs
 2013-10-29 12:29:13 -07:00
C. R. Oldham
1938b2c864 Complete support for restricting scheduled process running. 2013-10-29 13:08:56 -06:00
David Boucha
e64792c9d6 Merge pull request #8166 from nshalman/freezer_fixes 
Add 'email' and 'email.mime.*' to all esky builds
 2013-10-29 11:32:01 -07:00
Nahum Shalman
5079d271fb Add 'email' and 'email.mime.*' to all esky builds 
Fixes "ImportError: No module named audio" on SmartOS

Uses 'email.mime.*' rather than a full list of entries.

Also removes a duplicate entry for 'fileinput' from the
windows section that was added to the main FREEZER_INCLUDES

Email thread that suggested this fix:
https://groups.google.com/forum/#!msg/salt-users/_9ynHspSgjk/so0hRdbaPM0J

Tested as a fix to a 0.17.1 checkout on SmartOS.
 2013-10-29 14:24:45 -04:00