Commit Graph

2797 Commits

Author SHA1 Message Date
Thomas S Hatch
736c3e8dbb Merge pull request #643 from epoelke/develop
Cleanup to logging code in saltkey
2012-02-05 10:09:08 -08:00
Eric Poelke
6a0b3bcec8 Cleanup to logging code in saltkey
Renamed functions to be more discriptive. Cleaned up code to use hasattr instead of checking to see if level is None, this seems better to me since now the logging level provided does not exist it will just be ignored and the message will still be printed to the console.
2012-02-05 10:45:22 -08:00
Eric Poelke
20607efd10 Cleaned up an old turd
I found a turd in salt.cli related to key when I made the changes to logging in saltkey.  It has now been cleaned it up.
2012-02-05 10:01:08 -08:00
Thomas S Hatch
b1f1f00c07 Merge pull request #642 from epoelke/develop
Cleaned up an old turd
2012-02-05 09:27:01 -08:00
Thomas S Hatch
fd2a804466 error in mod_init function fix 2012-02-05 01:54:05 -07:00
Thomas S Hatch
e5fd3a78f6 Add mod_init interface to states
The mod init interface allows for another special function to be added
to a state module, the mod_init function allows for something to be run
which initializes the minion environment for the execution of states.
2012-02-05 01:50:07 -07:00
Thomas S Hatch
a09021c003 update strings to .format in the pkg state 2012-02-05 00:56:26 -07:00
Thomas S Hatch
8b8cf4c792 Add docs to the cp module 2012-02-05 00:40:11 -07:00
Thomas S Hatch
5c6b34fa3f Add kvm_hyper module, initial addition for salt-virt backend
This addition is the experimental introduction of the backend system
that will be used for the salt-virt cloud controller, this module will
only be loaded on machines running as libvirt kvm hypervisors
2012-02-05 00:04:43 -07:00
Thomas S Hatch
0670d9d2c6 Add gen_mac to utils 2012-02-04 23:36:53 -07:00
Thomas S Hatch
94ff149c45 Merge pull request #640 from archtaku/develop
fix syntax errors introduced in 0f776c13
2012-02-04 09:50:10 -08:00
Erik Johnson
29ac92990f fix syntax errors introduced in 0f776c13 2012-02-04 10:23:28 -06:00
Thomas S Hatch
21b1ba7aec clean up yumpkg5 from appearing on centos6 2012-02-03 23:06:20 -07:00
Thomas S Hatch
82b2f44f2b Merge pull request #638 from blast-hardcheese/develop
Tightened up configuration documentation
2012-02-03 21:23:24 -08:00
blast_hardcheese
50f95e24ea Tightened up configuration documentation
Fixed a couple typos, run-on sentences, and reworded a particularly
confusing section.
2012-02-03 21:17:01 -08:00
Thomas S Hatch
3a35e4ae81 fix docstring 2012-02-03 12:54:36 -07:00
Thomas S Hatch
6e996ce804 add initial freebsdservice module 2012-02-03 12:52:01 -07:00
Thomas S Hatch
e8aee275e9 catch unicode chars for templates 2012-02-03 11:16:26 -07:00
Jeff Schroeder
af7ea3d43a Merge pull request #635 from 0xDEC0DE/develop
fix crash bug in linux_sysctl.assign() on Virtuozzo containers
2012-02-03 04:57:47 -08:00
Nicolas Simonds
4e1c367c91 fix crash bug in linux_sysctl.assign() on Virtuozzo containers
On systems like Virtuozzo containers, "sysctl -w" is not allowed,
ever, and will fail with ENOPERM errors even if one is root.  Since
assign() doesn't check exit status or the returned string, this
leads to a nasty stack trace.
2012-02-03 00:11:00 -08:00
Thomas S Hatch
2a98ef1af2 Error out is requisites are not found
Now, in the even that a requisite cannot be found, then display an error
of all requisites that are not available
2012-02-02 23:09:55 -07:00
Thomas S Hatch
86f06b28fe major overhaul of requisite system
This is the initial overhaul of the requisite system, this fixes
primarily 2 things, firat the fact that watch did not properly require
the items that it watched, second there was a minor issue where all of
the requisites for the watch statement were not always being completely
checked, and third, you can now specify watch and require under a single
State/ID declaration
2012-02-02 16:55:40 -07:00
Thomas S Hatch
5646a015e7 Merge pull request #632 from whiteinge/salt-fixrunasuser
Change the ``cmd.run`` state to use the new ``runas`` arg
2012-02-02 13:41:28 -08:00
Thomas S Hatch
07d1eb7746 Merge pull request #633 from epoelke/develop
Bug fix to salt-key
2012-02-02 13:40:43 -08:00
Eric Poelke
260055591f Bug fix to salt-key
Fixed a logic error, in the logging/ouput code in salt/cli/key.py
2012-02-02 13:18:14 -08:00
Seth House
3d5a0875e5 Change the `cmd.run state to use the new runas` arg
Fixes #625.
2012-02-02 13:23:47 -07:00
Thomas S Hatch
208fbfa5b5 Add some returner documentation 2012-02-02 09:57:40 -07:00
Jeff Schroeder
62b4c46f76 Merge pull request #627 from chjohnst/develop
add saltversion grain
2012-02-01 13:14:20 -08:00
Seth House
a39d5eb6c5 Merge pull request #628 from archtaku/develop
spelling/grammar corrections
2012-02-01 13:04:40 -08:00
Seth House
6724c3e812 Merge pull request #629 from fatbox/mysql_grant_docs
Add more documentation to the mysql grants state module
2012-02-01 13:04:14 -08:00
Evan Borgstrom
9475c602c4 Add more documentation to the mysql grants state module 2012-02-01 15:53:48 -05:00
Erik Johnson
088bdc26f5 spelling/grammar corrections 2012-02-01 14:09:25 -06:00
Thomas S Hatch
3d56761382 Merge pull request #624 from chjohnst/59f61b04680baf1c3aa6b22b92a9640b84ffce03
Docs are not correct with network.ping as args are not supported
2012-02-01 11:09:27 -08:00
Christopher Johnston
5cbc0bfac5 add saltversion grain 2012-02-01 10:12:44 -08:00
Christopher Johnston
59f61b0468 args not support with network.ping 2012-02-01 09:25:27 -08:00
Thomas S Hatch
e7505e05aa Merge pull request #622 from chjohnst/develop
add support for network_io_counters and disk_io_counters from psutils
2012-02-01 08:01:31 -08:00
Christopher Johnston
252c26fb6d add support for network_io_counters and disk_io_counters from psutils 2012-02-01 07:54:45 -08:00
Thomas S Hatch
8ce33d72ea clean up a too long line 2012-01-31 23:39:56 -07:00
Thomas S Hatch
c295899f85 Ad initial docs for the jobs interface 2012-01-31 23:27:09 -07:00
Thomas S Hatch
0d524920e7 move the ec2 bootstrap into tutorials 2012-01-31 22:35:50 -07:00
Thomas S Hatch
3bbbdf7545 remove extra environments from matching when env is static 2012-01-31 22:25:51 -07:00
Thomas S Hatch
7e9cc5e50e Add environment to the minion config 2012-01-31 22:21:06 -07:00
Thomas S Hatch
6c57bc7fc4 Minor style cleanup in the state compiler 2012-01-31 22:04:30 -07:00
Thomas S Hatch
33ba81fa30 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-01-31 21:47:50 -07:00
Thomas S Hatch
f501b8e836 Add initial support for minion configured state environment 2012-01-31 21:47:26 -07:00
Thomas S Hatch
7350766473 Merge pull request #621 from akoumjian/develop
Adding ec2 cloud-init bootstrap docs
2012-01-31 20:36:02 -08:00
Alec Koumjian
8372ee5fd4 Adding ec2 cloud-init bootstrap docs 2012-01-31 20:33:39 -08:00
Thomas S Hatch
0f776c13be Add top file doc 2012-01-31 18:37:33 -07:00
Thomas S Hatch
6425dd1bb6 update grains doc 2012-01-31 17:05:42 -07:00
Thomas S Hatch
770bcc2c9f Merge pull request #620 from akoumjian/patch-1
Telling users where to place their custom grains (_grains). Also, what a...
2012-01-31 16:00:54 -08:00