Commit Graph

3168 Commits

Author SHA1 Message Date
Thomas S Hatch
a76314a0e8 Merge pull request #826 from dcolish/develop
Refactor of yaml file loading, added some with statements for file handling
2012-03-03 23:16:47 -08:00
Thomas S Hatch
7516374da7 update jinja utils module to use new fileclient interface 2012-03-04 00:11:24 -07:00
Thomas S Hatch
a4dedc2f0a change cp module to use fileclient interface 2012-03-04 00:10:10 -07:00
Thomas S Hatch
519b1ff251 Change state to use new fileclient interface 2012-03-04 00:09:34 -07:00
Thomas S Hatch
f31ecd781f remove FileClient from minion.py 2012-03-04 00:09:03 -07:00
Dan Colish
912e17c116 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-03-03 23:07:52 -08:00
Thomas S Hatch
0c232954d3 Add get_file_client to return uniform file client based on opts 2012-03-03 23:51:05 -07:00
Dan Colish
f421a83fc9 Merge branch 'develop' of git://github.com/saltstack/salt into develop 2012-03-03 22:45:14 -08:00
Dan Colish
ea2ef21cd5 Do not check for 'grains' key in opts, it will always have a grains key 2012-03-03 22:40:01 -08:00
Dan Colish
d1e6f5caa8 Refactor common yaml file loading of configuration 2012-03-03 22:40:01 -08:00
Dan Colish
929ac0718a Use template string replacement over raw concatenation 2012-03-03 22:40:01 -08:00
Dan Colish
b53cca532a One set of parens is enough 2012-03-03 22:40:01 -08:00
Dan Colish
6aeb31ae9b Use with statments for file handling when possible, drive by pep8 2012-03-03 22:40:01 -08:00
Thomas S Hatch
3c9e0dfd9c initial commit of new fileclient module
This module enables file clients to follow a unified design and
be made to interact with any available file cache, the basic idea
being that the file client interface does not need to be the master
per-se, but can be a local file_roots, or another file server that
suppiles similar interfaces as the salt file server.
2012-03-03 23:20:23 -07:00
Thomas S Hatch
38ec5786a2 Merge pull request #825 from dcolish/develop
Avoid duplicating grain loading in salt-call, skip verify, correct dest ...
2012-03-03 19:50:31 -08:00
Jeff Schroeder
881fa2a7d3 Fix issue with salt-run jobs.lookup_jid on unfinished jobs
Fixes #824
2012-03-03 18:40:50 -08:00
Dan Colish
ba491efb99 Fix another bad dest var name 2012-03-03 18:35:20 -08:00
Dan Colish
e25037f08f use set notation instead of iteration 2012-03-03 18:29:20 -08:00
Dan Colish
109985d5a3 Add verification of env back into salt-call 2012-03-03 18:21:50 -08:00
Dan Colish
bb1a005ece Avoid duplicating grain loading in salt-call, skip verify, correct dest in cli parser
The salt-call command was loading the grains twice, once in the minion
configuration and once at command run. Both loads are the same. In
addition, the parser was verifying the pki, logdir and cache dir, but
this is not important since everything is run locally from the
extension_modules path and printed to stdout.
2012-03-03 18:08:02 -08:00
Thomas S Hatch
d826be13e8 Merge pull request #823 from dcolish/develop
Add extension_modules to root path, Issue #758
2012-03-03 10:38:26 -08:00
Dan Colish
51e1227aab When jid is 0, returnerers are empty, Issue #822 2012-03-03 09:33:36 -08:00
Dan Colish
6810ee21cd Add extension_modules to root path, Issue #758 2012-03-03 09:19:16 -08:00
Thomas S Hatch
05970e4e6e Track full returns within the return retrival function for the cli 2012-03-03 08:27:08 -07:00
Thomas S Hatch
24bce3d9bb Merge branch 'develop' of https://github.com/dcolish/salt into dcolish-develop
Conflicts:
	salt/cli/__init__.py
2012-03-03 08:20:29 -07:00
Dan Colish
f0d05c13d9 Refactor common loader code 2012-03-02 23:56:29 -08:00
Dan Colish
b0abefc157 fix bad dest var names 2012-03-02 23:55:40 -08:00
Dan Colish
26dfcafd66 Use tuple for checking multiple suffixes with endswith 2012-03-02 23:22:21 -08:00
Dan Colish
0ce6db7e33 Use context manager so file is guaranteed to close after block 2012-03-02 23:12:28 -08:00
Dan Colish
faf3205594 More cli overlay refator, normalize the use of conf_file for config file path 2012-03-02 23:07:11 -08:00
Thomas S Hatch
9d23c45640 Add initial docs for advanced file server settings 2012-03-02 23:32:40 -07:00
Thomas S Hatch
4eaa3971ab Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-02 23:14:15 -07:00
Thomas S Hatch
222976b691 Started on #757
Documented some YAML issues we run into when making sls files
2012-03-02 23:12:53 -07:00
Dan Colish
c33f6c5c17 remove unused var 2012-03-02 21:53:02 -08:00
Thomas S Hatch
6198d3be9b Merge pull request #819 from dcolish/develop
Allow pidfile to be configured for master in master config in addition t...
2012-03-02 21:36:15 -08:00
Dan Colish
f0387d5225 Allow pidfile to be configured for master in master config in addition to the command line 2012-03-02 21:33:20 -08:00
Thomas S Hatch
5e10c58ffd Merge pull request #818 from dcolish/develop
Fix overlay of command line options in salt-key.
2012-03-02 21:33:12 -08:00
Dan Colish
4981752f1d Fix overlay of command line options in salt-key. Ensure only one definition of default for args which also reside in master config 2012-03-02 21:28:26 -08:00
Thomas S Hatch
91bbc10483 Add provision to fall back to msgpack_pure if msgpack is not installed 2012-03-02 22:24:51 -07:00
Thomas S Hatch
f84e58962b Add verbose option to default command 2012-03-02 21:29:20 -07:00
Thomas S Hatch
edaa807ab0 Add verbose option to default command 2012-03-02 21:28:30 -07:00
Thomas S Hatch
8cc4f09666 change the default to use the new command structure 2012-03-02 15:17:31 -07:00
Thomas S Hatch
0a88ef6196 Add backend for new timeoutless execution 2012-03-02 15:16:36 -07:00
Thomas S Hatch
fca44fc9e7 fix stack trace with grains error 2012-03-02 12:15:45 -07:00
Thomas S Hatch
ede77b7d15 add --batch-size to the options for -b 2012-03-02 11:32:12 -07:00
Thomas S Hatch
3501ec11b1 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-03-02 00:23:02 -07:00
Thomas S Hatch
7170dae5d2 Make state never return None 2012-03-02 00:22:40 -07:00
Jeff Schroeder
38551f3f9f Fix another small issue with compiling templates
If the file contains only whitespace such as \r, \n, spaces, and
tabs, the compile would fail. This checks for that and then does
a better job of documenting the checks with comments and  stuff.
2012-03-01 23:20:53 -08:00
Thomas S Hatch
b65a926bff Merge pull request #813 from tomprince/patch-1
Add tests directory to source distribution.
2012-03-01 23:02:31 -08:00
Jeff Schroeder
6ad40d567f Merge pull request #812 from SEJeff/oh-nine-eight-fixes
Some fixes for the 0.9.8 milestone
2012-03-01 22:57:44 -08:00