Pedro Algarvio
d4005bee3d
We now warn the users about misusing mode in file.recurse. Fixes #2726 .
...
* Extended `SaltReturnAssertsMixIn` by adding `assertNotInSaltComment`.
* Fixed minor `tab` instead of spaces in `salt.states.file` code.
2012-11-28 17:57:44 +00:00
Pedro Algarvio
c782eae106
Extended SaltReturnAssertsMixIn and included a test case which triggers #2726 .
...
* Extended `SaltReturnAssertsMixIn`, `assertInSaltComment`, which allows to see if a string is in a salt's returned comment.
2012-11-28 17:35:25 +00:00
Thomas S Hatch
10208487c1
Merge pull request #2722 from giantlock/develop
...
fix cron state and module
2012-11-27 13:15:16 -08:00
Thomas S Hatch
61deeaa617
Merge pull request #2721 from FireHost/fix_root_group_ownership
...
Fix ambiguous conditional for missing group name
2012-11-27 13:10:25 -08:00
Denis Generalov
87963ee8bc
* Fix cron.file state:
...
Every time when we feed crontab with it's own tab we've got 3 extra line to new tab with warnings about our wrong way to maintain cron tabs.
* PEP8 fixes (indentation mainly)
2012-11-28 01:05:26 +04:00
Aaron Tygart
d25a20a9a8
Fix ambiguous conditional for missing group name
2012-11-27 14:57:23 -06:00
Thomas S Hatch
4dd7b0541e
Merge pull request #2720 from seanchannel/develop
...
copyright, changelog, and control updates
2012-11-27 12:29:20 -08:00
Sean Channel
1a85cb7a92
copyright, changelog, and control updates
2012-11-27 12:22:32 -08:00
Thomas S Hatch
e72f02bb80
Merge pull request #2719 from FireHost/fix_missing_re_in_yumpkg
...
Add missing re import to yumpkg
2012-11-27 12:06:23 -08:00
Aaron Tygart
1a32d9a7e1
Add missing re import to yumpkg
2012-11-27 13:59:21 -06:00
Thomas S Hatch
836c45a281
Merge pull request #2718 from timl/develop
...
manage.down should examine hosts with accepted keys
2012-11-27 11:47:21 -08:00
Tim Laszlo
de0a37e138
manage.down should examine hosts with accepted keys
2012-11-27 13:40:27 -06:00
Thomas S Hatch
ef0dd7d98a
Merge pull request #2716 from giantlock/develop
...
clean temp files on test mode (test=true)
2012-11-27 09:25:27 -08:00
Thomas S Hatch
945d8b3a49
Merge pull request #2715 from andrewbunday/develop
...
Updated modules/puppet.py
2012-11-27 09:22:23 -08:00
Andrew Bunday
6566463030
Clearing out __pub match regex and using utils.clean_kwargs instead.
2012-11-27 17:20:52 +00:00
Thomas S Hatch
b1166dbfc4
Merge pull request #2714 from techhat/baremetal
...
Adding module to manage locales
2012-11-27 09:20:33 -08:00
Andrew Bunday
66b94af780
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2012-11-27 17:15:44 +00:00
Thomas S Hatch
9515396e2f
Add a clean_kwargs function to utils
2012-11-27 10:10:09 -07:00
Denis Generalov
ddee94bdf1
clean temp files on test mode (test=true)
2012-11-27 20:42:22 +04:00
Joseph Hall
1b22855c81
Adding module to manage locales
2012-11-27 06:51:57 -07:00
Andrew Bunday
708f7a6743
Merge branch 'develop' of https://github.com/saltstack/salt into develop
2012-11-27 13:46:32 +00:00
Andrew Bunday
6d70c484f3
class _Puppet(object)
...
+ added a couple of comments.
- removed the --test argument from 'puppet agent'
+ when 'puppet agent --test' is called, --detailed-exitcodes is enabled.
this causes the return exit code to be 2 if changes have occured during
the run. without handling these we can instead manually specify each of
the options --test turns on, without the detailed-exitcodes.
def run(*args, **kwargs)
+ edited the conditional on args so that when _no_ positional arguments
have been provided the _Puppet.arguments() method is still called.
allows salt '*' puppet.run, to identify the agent subcmd and add test
parameters.
def facts()
+ put continue on a new line to satisfy pep8 rules.
2012-11-27 13:46:18 +00:00
Joseph Hall
5ebe9b66ea
Merge pull request #2713 from techhat/baremetal
...
Typo fix in timezone
2012-11-27 05:36:57 -08:00
Joseph Hall
7454bfaad6
Typo fix in timezone
2012-11-27 06:34:49 -07:00
Andrew Bunday
b8bf204740
Adding default color kwarg to all puppet calls. Setting to 'false' turns
...
off colored text output.
2012-11-27 13:30:15 +00:00
Thomas S Hatch
d87b6c08cc
Merge pull request #2697 from tsclausing/xenv-include
...
#2683 - include state sls from any env which the minion matches in top
2012-11-26 23:34:26 -08:00
tsclausing
1fa275fcf5
#2683 - Syntax to include states from explicit env, or resolve with _xenv.
2012-11-27 00:53:30 -06:00
Thomas S Hatch
80b2b164cd
Merge pull request #2637 from andrewbunday/develop
...
Adds ability to run puppet masterless
2012-11-26 22:11:34 -08:00
Thomas S Hatch
6ecb3a41b8
Fix #2468
2012-11-26 22:57:17 -07:00
tsclausing
4b6dc3b56c
Merge branch 'develop' into xenv-include
2012-11-26 22:58:07 -06:00
Thomas S Hatch
9fb713efc3
Merge pull request #2711 from techhat/baremetal
...
Add module for managing timezone
2012-11-26 20:53:22 -08:00
Joseph Hall
9cf8ae805b
Add module for managing timezone
2012-11-26 21:47:27 -07:00
tsclausing
84ce8160cf
Merge remote-tracking branch 'saltstack/develop' into develop
2012-11-26 22:41:53 -06:00
Sean Channel
45b41e856a
Merge pull request #2710 from seanchannel/develop
...
use files from pkg/
per comments in commit 09f2239
2012-11-26 16:04:31 -08:00
Sean Channel
4080eeada4
use files from pkg/
2012-11-26 15:59:42 -08:00
Thomas S Hatch
33a18367c0
Make the batch class more apiable
2012-11-26 11:32:28 -07:00
Thomas S Hatch
c65708031b
Add recon_max to the minion config
2012-11-26 11:05:35 -07:00
Thomas S Hatch
07de7ff6f5
Add zeromq reconnect max value to fix #2654
2012-11-26 10:49:51 -07:00
Thomas S Hatch
be8ecf2cd4
Merge pull request #2706 from fatbox/rpm-faster-version
...
Speed up yum/rpm version() if we're not looking for something specific
2012-11-26 09:29:31 -08:00
Evan Borgstrom
747ee941f6
Speed up yum/rpm version() if we're not looking for something specific
...
While testing things I end up applying state a lot, and when yum is
invoked for every single `pkg.installed` state it ends up taking a
really long time.
Since the comments for list_pkgs say it's being used to handle version
matching I think it's a reasonable assumption to make that if the
package name provided to `version` does not contain a number then the user
doesn't have any complex version matching requirements.
This makes my state run times go from:
real 1m16.450s
user 0m3.016s
sys 0m0.657s
To:
real 0m4.689s
user 0m1.780s
sys 0m0.333s
Let me know if you have any conerns about this.
2012-11-26 01:49:09 -05:00
Thomas S Hatch
1dd104c706
Merge pull request #2704 from s0undt3ch/develop
...
Minor improvements to the tests daemon.
2012-11-25 22:09:50 -08:00
Pedro Algarvio
bd552ef4a8
Migrate some of the Vagrant branch improved minions wait and sync code.
2012-11-26 05:44:18 +00:00
Thomas S Hatch
f8543d061b
Merge pull request #2703 from archtaku/develop
...
Make win_pkg.py act like other pkg providers
2012-11-25 20:36:16 -08:00
Pedro Algarvio
8227e6374e
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-11-26 04:33:04 +00:00
Pedro Algarvio
74aeeab5e5
Add some color when a test minion connects(trigger a Travis build).
2012-11-26 04:32:25 +00:00
Erik Johnson
501ec6b191
Make win_pkg.py act like other pkg providers
...
Where applicable, rather than returning a string noting that a function
is not implemented, instead return an empty version of the expected
return data type, and log a message at loglevel "warning" to note that
the function has not been implemented.
2012-11-25 22:30:25 -06:00
Thomas S Hatch
6f5f67653d
Merge pull request #2701 from s0undt3ch/develop
...
Fix `UnboundLocalError` on `salt.modules.file.patch()`
2012-11-25 20:05:46 -08:00
Thomas S Hatch
23ea376e04
Merge pull request #2702 from tsclausing/minion-auth
...
#2691 - Minions do not reconnect if not authed
2012-11-25 20:05:08 -08:00
Pedro Algarvio
e4f28d1db8
Fix UnboundLocalError on salt.modules.file.patch()
2012-11-26 04:02:22 +00:00
Thomas S Hatch
675397e5bf
Merge pull request #2700 from s0undt3ch/hotfix/distutils-warnings
...
Handle non supported distutils options.
2012-11-25 19:56:16 -08:00
