Danny George
7c38730cdb
Changed subprocess.Popen call to salt's cmd.run
...
Per suggestion by SEJeff removed call to subprocess
Also simplified vendor default field logic
2012-12-19 07:33:18 -07:00
Seth House
abffab5315
Merge pull request #2946 from archtaku/docs
...
Updated docs for grains, modules, and states
2012-12-19 04:49:27 -08:00
Erik Johnson
5def1dd54c
Updated docs for grains, modules, and states
...
Added links to module function documentation, as well as to
"file_roots", and mentioned the saltutil.sync_* functions. Will probably
do the same for returners and renderers soon. This should help people
navigate through the docs easier.
2012-12-18 23:29:36 -06:00
David Boucha
587c08c169
Merge pull request #2945 from techhat/fedoraremi
...
Adding fedoraremi (Fedora Remix) to _OS_NAME_MAP
2012-12-18 20:04:03 -08:00
Danny George
0b17605685
Moved locale_info grain outside of os_data
...
cleaning up os_data function
created locale_info function to provides defaultlanguage and
defaultencoding
These were previously in os_data, but no reason to be
2012-12-18 19:18:18 -07:00
Ryan Schneider
8f8cc74b34
Some minor cleanup of unit and integration tests.
2012-12-18 17:39:16 -08:00
Mike Chesnut
d7d9f4de4f
change from jinja's PackageLoader to FileSystemLoader
...
this removes the dependency on distribute (setuptools) at runtime.
added some checks around each of the calls to get_template, to
catch the exception thrown when the template environment cannot be
loaded by the FileSystemLoader.
a good TODO / follow-up to this would be to enhance
states/network.py to better handle the situations this creates...
2012-12-18 16:39:08 -08:00
Nicolas Kuttler
f8e7b70ac7
Build docs before trying to copy doc files
2012-12-19 01:38:19 +01:00
Thomas S Hatch
dad6d6ac75
Merge pull request #2940 from giantlock/develop
...
cron.file state fix
2012-12-18 15:35:56 -08:00
Thomas S Hatch
77df0a2dbf
Start on the reactor docs
2012-12-18 16:34:22 -07:00
Denis Generalov
f0bc41424d
cron.raw_cron needs exactly raw stdout from cmd.run
2012-12-19 03:09:38 +04:00
David Boucha
75b3ad63ad
Merge pull request #2939 from peterlandry/develop
...
Remove reference to schema
2012-12-18 14:19:05 -08:00
Peter Landry
bf85260768
Remove reference to schema
...
Postgresql has a meaningful difference between schema and database, so conflating them here could be confusing:
http://www.postgresql.org/docs/9.2/static/ddl-schemas.html
2012-12-18 17:09:15 -05:00
Thomas S Hatch
58dd257b55
Merge pull request #2938 from techhat/glance
...
Change nova references to glance
2012-12-18 13:52:58 -08:00
Thomas S Hatch
5648117b8b
Add release docs
2012-12-18 14:51:42 -07:00
Joseph Hall
7971c53767
Change nova references to glance
2012-12-18 14:51:32 -07:00
Thomas S Hatch
aa41b5527d
Merge pull request #2936 from ryanschneider/cmd.run-templates
...
cmd and archive modules template arg
2012-12-18 12:31:46 -08:00
Ryan Schneider
fa169fe36d
Add template argument docs for cmd.run*
2012-12-18 11:14:16 -08:00
Ryan Schneider
bf877ac051
Add docstrings for template arg.
2012-12-18 10:59:46 -08:00
David Boucha
279b77f4ef
Merge remote-tracking branch 'upstream/master' into develop
2012-12-18 11:54:20 -07:00
Ryan Schneider
7dc65012dc
Merge remote branch 'upstream/develop' into cmd.run-templates
2012-12-18 10:14:03 -08:00
Thomas S Hatch
4c275e8071
Merge pull request #2935 from techhat/develop
...
user_role_list now requires both a user and a tenant
2012-12-18 09:25:54 -08:00
Joseph Hall
b869fc9e3f
user_role_list now requures both a user and a tenant
2012-12-18 10:20:29 -07:00
Thomas S Hatch
f63579afb4
Merge pull request #2934 from dangets/gpu_grain
...
Added basic gpu info grain for linux
2012-12-18 08:58:38 -08:00
Danny George
f310db5147
Added basic gpu info grain for linux
2012-12-18 09:18:29 -07:00
Thomas S Hatch
82e9c607a9
Merge pull request #2933 from s0undt3ch/develop
...
Cleanup and more configuration
2012-12-18 07:05:29 -08:00
Pedro Algarvio
ba09404238
Allow different date formats for the console and the logfile to be configured.
2012-12-18 13:35:13 +00:00
Pedro Algarvio
554e9c1b02
Remove left over global MAX_LOGGER_MODNAME_LENGTH.
2012-12-18 11:33:25 +00:00
Thomas S Hatch
134521c59f
Merge pull request #2931 from giantlock/develop
...
few freebsd related changes
2012-12-17 15:13:18 -08:00
Thomas S Hatch
68653fa272
Merge pull request #2930 from aleszoulek/develop
...
Batch.run() should return minion name as dictionary key
2012-12-17 15:10:51 -08:00
Thomas S Hatch
19317a731d
Only check the token if the master public key was already there
2012-12-17 16:07:07 -07:00
Thomas S Hatch
b53216554c
remove master load old salty bacon token completely
2012-12-17 16:06:07 -07:00
Denis Generalov
d708a12014
Use service command for determining service status
2012-12-18 02:14:26 +04:00
Denis Generalov
f53fff5cdc
* Mass package install/remove support
...
* Fix available_version: search binary in PATH
* Remove unused code
* Small changes: pep8 and style
2012-12-18 02:10:36 +04:00
Ales Zoulek
cb59d41b2e
Batch.run() should return minion name as
...
- When using Batch.run() (or client.cmd_batch()) there was no way to tell
from what minion the returned date came from.
- Batch.run() returns a dictionary which has minion id as a key, and
returned data as a value
2012-12-17 22:12:15 +01:00
Thomas S Hatch
950b6aa6cf
Merge pull request #2929 from aleszoulek/develop
...
Bugfix Batch class quiet option
2012-12-17 12:59:53 -08:00
Ales Zoulek
4bb4fa6617
Bugfix Batch class quiet option
...
- look for quiet attribute on the class, it's not global, neither
local var
2012-12-17 21:49:12 +01:00
Thomas S Hatch
3a0fd0b560
Fix bug in open mode authentication
2012-12-17 13:48:55 -07:00
Thomas S Hatch
382be4780b
Merge pull request #2927 from Talksum/yumpkg_rpmdb
...
switch list_pkgs on yum-based systems to using the rpmdb
2012-12-17 12:37:42 -08:00
Thomas S Hatch
d9cc638923
Fix error if sig is ommited
2012-12-17 13:30:09 -07:00
Thomas S Hatch
99257f890d
Minion side additions for #2916
2012-12-17 13:00:14 -07:00
Mike Chesnut
585f7cce05
switch list_pkgs on yum-based systems to using the rpmdb instead of a cmd.run
...
the rest of this module likes to use YumBase(), so do that for list_pkgs
as well. this is just a straight-forward switch to how the package list is
queried, it doesn't change anything functionality-wise.
2012-12-17 11:37:13 -08:00
Thomas S Hatch
70422c9304
Master side additions to fix #2916
2012-12-17 11:27:23 -07:00
Thomas S Hatch
945fc10855
Merge pull request #2925 from archtaku/issue2922
...
fix virtual package installs (#2922 )
2012-12-17 09:57:53 -08:00
Thomas S Hatch
f137051bc8
Merge pull request #2924 from alekibango/develop
...
Another fix for another reincarnation of #2111
2012-12-17 09:33:36 -08:00
David Pravec
826e7e4d66
another fix of issue #2111
...
on Debian wheezy, salt-call -g |grep os_family
gives:
os_family: debian
Which means that apt will not be used
(it checks os_family for 'Debian').
so i added debian -> Debian into _OS_FAMILY_MAP
... this patch also contains 2 little pep8 fixes
2012-12-17 18:13:17 +01:00
David Pravec
e6b247ad12
adding myself to authors file
...
after sending few patches and bash completion,
i finally add myself to AUTHORS file.
2012-12-17 18:11:23 +01:00
Erik Johnson
aa38c043fa
fix virtual package installs ( #2922 )
2012-12-17 10:53:31 -06:00
Thomas S Hatch
a84ee64ea0
Merge pull request #2923 from s0undt3ch/develop
...
Allow default log settings to be re-usable(allow importing them)
2012-12-17 08:13:05 -08:00
Pedro Algarvio
14f73d5f84
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-12-17 16:10:17 +00:00
