David Bishop
f2fbd267e3
Add error handling for new XEN support
2012-03-06 01:43:52 -05:00
David Bishop
09860b447c
add XEN support to virt.py
2012-03-06 01:32:33 -05: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
Thomas S Hatch
bae51edae4
change return to yield, more to come
2012-03-05 16:30:26 -07:00
Jeff Schroeder
e59c9fbd99
s/pup_data/pub_data/ woof!
2012-03-05 15:21:32 -08:00
Thomas S Hatch
f6ba7d1f85
jid == 0 meand the master is not turned on!
2012-03-05 14:08:14 -07:00
Thomas S Hatch
85365da9b6
Merge pull request #839 from dcolish/develop
...
Issue #832 , check source state files exist before rendering.
2012-03-05 08:03:54 -08:00
Dan Colish
9f97cd1154
Issue #832 , check source state files exist before rendering.
...
Bonus removal of call to globals.
2012-03-05 08:01:49 -08:00
Jeff Schroeder
98a482e611
Fix a typo in the loader refactor pointed out by @archme
2012-03-05 06:53:58 -08:00
Thomas S Hatch
f8d3bf8fd1
Merge pull request #838 from blast-hardcheese/develop
...
Modified order directories are checked in salt/loader.py
2012-03-04 22:29:54 -08:00
Thomas S Hatch
77e813c81e
Add grain_pcre to compound matcher, use R@os:Arch.*
2012-03-04 23:01:46 -07:00
blast_hardcheese
c752116fd7
Altering render to use _create_loader
2012-03-04 21:54:27 -08:00
Thomas S Hatch
4ee6ac13b4
Add faulty returns for get_file
2012-03-04 22:36:46 -07:00
Thomas S Hatch
3e5bc4ff5a
Add state_top to the minion config
2012-03-04 22:15:06 -07:00
Thomas S Hatch
221e068057
Add the file_client option to the defeault config
2012-03-04 22:01:08 -07:00
Thomas S Hatch
fd792c1caa
Add file directory settings to the minion config template
2012-03-04 21:59:39 -07:00
Thomas S Hatch
c03da4206f
Add local file client opts to minion
2012-03-04 21:49:20 -07:00
blast_hardcheese
1752715a9e
Reordering directories in _create_loader
...
The goal of this commit (not sure if I achieved it) was for
user-specified _modules to override builtins.
2012-03-04 18:42:36 -08:00
Thomas S Hatch
66611b9dcf
Merge pull request #833 from dcolish/develop
...
Fix dynamic reloading of grains
2012-03-04 13:33:53 -08:00
Dan Colish
0c907dfc7a
Use a property to recalculate the master_pub uri.
...
This should allow dns updates for the master name to be used when
reconnecting
2012-03-04 11:35:30 -08:00
Dan Colish
17c91adae7
Refactor common code in state.module_refresh
2012-03-04 11:25:40 -08:00
Dan Colish
15accc5bec
Fix dynamic reloading of grains
2012-03-04 11:07:35 -08:00
Thomas S Hatch
342b60e18a
Merge pull request #831 from dcolish/develop
...
Use str.format for template string
2012-03-04 10:48:36 -08:00
Dan Colish
d458954e72
Use str.format for template string
2012-03-04 10:45:53 -08:00
Thomas S Hatch
63de41339a
Merge pull request #830 from dcolish/develop
...
Quote state which caused error in messages for clarity
2012-03-04 10:44:50 -08:00
Dan Colish
56441ddda4
Quote state which caused error in messages for clarity
2012-03-04 10:40:54 -08:00
Thomas S Hatch
1a3892b09f
Merge pull request #829 from dcolish/develop
...
let minion run as non-root, use more with statements
2012-03-04 10:30:08 -08:00
Dan Colish
fefcc60e5d
Merge with upstream develop
2012-03-04 09:33:53 -08:00
Dan Colish
1bdd2bad6b
Use with statements when working with files in states.file
2012-03-04 09:28:43 -08:00
Dan Colish
4fa502bc59
Use u+rwx for cachedir makedirs.
...
This allows the use of salt when run as a non-root user on a minion.
2012-03-04 09:26:42 -08:00
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
