Commit Graph

3453 Commits

Author SHA1 Message Date
Dan Colish
3752742fa0 Refactor common template code for pillar and states 2012-03-06 20:42:01 -08:00
Dan Colish
75cec7d0df Use correct var 2012-03-06 20:34:02 -08:00
Thomas S Hatch
1ac9a37e25 Merge pull request #853 from grierj/contribute
Adding Range Support to Salt
2012-03-06 18:52:44 -08:00
Grier Johnson
f5642c9073 Adding Range Support to Salt
Range is a cluster based metadata store.  It was used internally at
yahoo and recently open source.  You can read about range here:

https://github.com/grierj/range/wiki/Introduction-to-Range-with-YAML-files

Range allows arbitrary grouping of hosts via clusters and the storage
of metadata along with them.  Additionally there is a powerful DSL that
allows for set operations, regexes, and multilayer cluster referencing.

The implementation here runs the range query and reduces it to a list
style expression format, which means only the salt master needs to know
about range or have the range libraries installed.
2012-03-06 18:26:23 -08:00
Grier Johnson
fdaf56de55 Merge remote branch 'upstream/develop' into contribute
Conflicts:
	salt/__init__.py
2012-03-06 17:38:00 -08:00
Thomas S Hatch
52987c5cf8 Add pillar data to templates 2012-03-06 16:42:18 -07:00
Thomas S Hatch
5cab526fde Add pillar to python renderer 2012-03-06 16:37:29 -07:00
Thomas S Hatch
a0991e3254 Add pillar to yaml_mako 2012-03-06 16:36:40 -07:00
Thomas S Hatch
796f8ab7e0 add pillar to json_mako 2012-03-06 16:36:04 -07:00
Thomas S Hatch
3e2801d171 Add pillar to json_jinja 2012-03-06 16:34:59 -07:00
Thomas S Hatch
8367b242e5 Add pillar data to the loader 2012-03-06 16:33:20 -07:00
Thomas S Hatch
fb25fa04cf Add pillar data to default renderer 2012-03-06 16:32:53 -07:00
Thomas S Hatch
97d69856bd Add pillar data to the minion opts after grains 2012-03-06 16:07:04 -07:00
Thomas S Hatch
2c8d19ff9d Add extension_modules to master 2012-03-06 14:37:12 -07:00
Thomas S Hatch
5f1ed1e9c3 Accept a new pillar command on the master 2012-03-06 14:33:12 -07:00
Thomas S Hatch
effa7c3036 Add remote pillar to pillar.py 2012-03-06 14:32:33 -07:00
Thomas S Hatch
96a1ef866b Add pillar module 2012-03-06 13:21:19 -07:00
Thomas S Hatch
62a38a1c90 add state_top reconciliation for pillar 2012-03-06 12:59:42 -07:00
Thomas S Hatch
1c545771cc forgot comma 2012-03-06 12:44:59 -07:00
Thomas S Hatch
cd8dd7bf14 Add pillar_roots to the config 2012-03-06 12:38:44 -07:00
Thomas S Hatch
5e4e900d41 Add id to pillar object 2012-03-06 12:31:21 -07:00
Thomas S Hatch
7f7a47b028 Add pillar module 2012-03-06 12:06:40 -07:00
Thomas S Hatch
d3a8db8dcb Clean the extend data 2012-03-06 11:39:46 -07:00
Thomas S Hatch
883138b850 Add option to _check_perms 2012-03-06 10:14:43 -07:00
Thomas S Hatch
80883d6492 Fix break in file server
A chmod was added before a file was acctually placed
2012-03-06 10:10:27 -07:00
Thomas S Hatch
25d8e41f9a Merge pull request #849 from dcolish/develop
More context managers and file handling, move perm check.
2012-03-05 22:56:29 -08:00
Dan Colish
81eaec6625 manual merge upstream 2012-03-05 22:52:08 -08:00
Thomas S Hatch
5c071a73af Merge pull request #848 from teancom/develop
Add XEN support to virt.py
2012-03-05 22:50:08 -08:00
David Bishop
f2fbd267e3 Add error handling for new XEN support 2012-03-06 01:43:52 -05:00
Dan Colish
4d26addac0 Move other permission check to after file is copied into place 2012-03-05 22:43:11 -08:00
David Bishop
09860b447c add XEN support to virt.py 2012-03-06 01:32:33 -05:00
Dan Colish
4273581253 More use of context managers, check files are being closed when possible 2012-03-05 22:23:54 -08:00
Thomas S Hatch
c223a4c322 Merge pull request #845 from dcolish/develop
Fix function signature
2012-03-05 21:37:33 -08:00
Dan Colish
d0adeb1c92 Fix function signature 2012-03-05 21:36:05 -08:00
David Boucha
39e63b098b Merge branch 'develop' of git://github.com/saltstack/salt into add_win_network 2012-03-05 21:56:58 -07:00
Thomas S Hatch
a9a3db6fd0 another fix for windows grains support 2012-03-05 21:56:41 -07:00
David Boucha
d6fce61404 Merge branch 'develop' of git://github.com/saltstack/salt into add_win_network 2012-03-05 21:53:11 -07:00
Thomas S Hatch
467d54870e Add _ps function to windows grains 2012-03-05 21:51:58 -07:00
David Boucha
3992d9d802 Merge branch 'develop' of git://github.com/saltstack/salt into add_win_network 2012-03-05 21:42:59 -07:00
Thomas S Hatch
770de8ce85 fix grains typo 2012-03-05 21:42:48 -07:00
David Boucha
7932ead250 Merge branch 'develop' of git://github.com/saltstack/salt into add_win_network 2012-03-05 21:42:26 -07:00
Thomas S Hatch
5937388634 Add windows ps grain 2012-03-05 21:41:52 -07:00
David Boucha
03ffad6231 Merge branch 'develop' of git://github.com/saltstack/salt into add_win_network 2012-03-05 21:07:08 -07:00
Thomas S Hatch
aa7a52f8d0 Merge pull request #844 from teancom/develop
Only grab group and user out of qemu.conf if they are uncommented.
2012-03-05 19:30:42 -08:00
David Bishop
7ad3728290 Only grab group and user out of qemu.conf if they are uncommented. Default to root:root 2012-03-05 22:14:22 -05:00
Thomas S Hatch
9c110005ae Merge pull request #843 from dcolish/develop
Refactor error reporting in states.file
2012-03-05 18:15:16 -08:00
Dan Colish
fe9c9c7637 Check file permissions and user/group ownership after it exists.
Also refactor common permission check code
2012-03-05 18:07:58 -08:00
Dan Colish
d96f5107a8 Fix typo 2012-03-05 16:17:50 -08:00
Dan Colish
dfab186d92 Refactor error reporting in states.file 2012-03-05 15:53:42 -08:00
Thomas S Hatch
7b6d666fce evaluate for the string 0 2012-03-05 16:35:29 -07:00