Commit Graph

3168 Commits

Author SHA1 Message Date
Grier Johnson
dcebaac7f7 Pass the user in the load
Forgot to add the actual user in the payload so the minion can read it
out for logging.
2012-02-28 16:45:01 -08:00
Thomas S Hatch
fe83dfc437 Merge pull request #790 from l2ol33rt/develop
Rehashing of CShell after pkgs are installed
2012-02-28 16:26:32 -08:00
Thomas S Hatch
33681bfcb9 Merge pull request #788 from gordonm/develop
Fix a few typos and docstring/comment formatting
2012-02-28 16:22:49 -08:00
Robert James Hernandez
683e74ea7c Corrected CLI example thanks to SEJeff! 2012-02-28 16:18:30 -08:00
Jeff Schroeder
0dcf8eca80 Merge pull request #787 from blast-hardcheese/develop
Adding **kwargs to pkg installed and latest
2012-02-28 16:08:28 -08:00
Gordon McAllister
9f0f8c8ebc Fix a few typos and docstring/comment formatting 2012-02-28 16:01:48 -08:00
Devon Stewart
cbe25bf64b Adding **kwargs to pkg installed and latest 2012-02-28 15:59:10 -08:00
Thomas S Hatch
de8011adb2 Allow states to cleanly accept **kwargs
This addition makes it so that ALL data in the low state chunk is passed
to the state function via **kwargs. This means that by passing a
**kwargs from states all the back to a module function will allow for
very transparent additions of arguments to states that accept **kwargs
2012-02-28 16:29:21 -07:00
Grier Johnson
679a3843b1 Move user logging and passing optional
Only pass the user in payload if it is not root and not the specified
user from the configuration file.  Those two users are implied to be
the executor if there's no specific user.  Log statements referencing
the user have been wrapped in statements testing for the existence of
the user key in the payload, otherwise log messages fall back to a
non-user log message (it will continue to do this for root).

This preserves backwards compatibility for masters that would never
pass the user as well
2012-02-28 14:31:34 -08:00
Thomas S Hatch
6a80f56a77 Merge pull request #784 from blast-hardcheese/develop
Extending apt module to use debconf
2012-02-28 12:00:55 -08:00
Devon Stewart
b39f4a862a Adding debconf support to apt 2012-02-28 11:44:37 -08:00
Devon Stewart
f6794b485c Adding set_file to debconf module
Allows for a more natural interface to debconf
2012-02-28 10:37:08 -08:00
Thomas S Hatch
53c9b29a7a add grain_pcre tracking to salt-cp 2012-02-28 11:27:02 -07:00
Thomas S Hatch
5cf106b554 Merge branch 'develop' of github.com:saltstack/salt into develop 2012-02-28 11:10:56 -07:00
Thomas S Hatch
aedd16cb70 Add minion side grain matcher changes 2012-02-28 11:02:10 -07:00
Thomas S Hatch
a3a3755669 Add client side changes for new grain-pcre matcher 2012-02-28 11:01:08 -07:00
Thomas S Hatch
856d695d39 Merge pull request #781 from blast-hardcheese/develop
Adding debconf module
2012-02-28 08:26:28 -08:00
Devon Stewart
3c162240d7 Adding debconf module
Allows getting all selections, getting a single package,
and setting the answer to a single question for a single package.
2012-02-28 02:06:33 -08:00
Thomas S Hatch
87cf685249 Merge branch 'develop' of github.com:saltstack/salt into develop
Conflicts:
	salt/minion.py
2012-02-28 00:39:12 -07:00
Thomas S Hatch
d7a2cd5a90 Merge pull request #779 from gordonm/develop
Fixes for compound matching
2012-02-27 23:35:29 -08:00
Thomas S Hatch
3e3324e5d0 fix unspecified glob match in compound matcher 2012-02-28 00:32:24 -07:00
Thomas S Hatch
ab7c16b92b move log forward so that data is more accurate 2012-02-28 00:20:14 -07:00
Gordon McAllister
04cc3863b3 Fixes for compound matching
Previously booleans were appended to the results list unnecessarily
in some cases and all matchers were evaluated twice.
2012-02-27 23:15:14 -08:00
Thomas S Hatch
a19dfbc12d fix comparison issue in compond matcher 2012-02-27 23:39:07 -07:00
Thomas S Hatch
e62e7cceb4 Fix compatability bug in user data transfer 2012-02-27 23:37:59 -07:00
Thomas S Hatch
fc7e0d984a Merge pull request #778 from cedwards/documentation
formatting and clarification cleanup in docs
2012-02-27 20:34:40 -08:00
Christer Edwards
f227c335b6 formatting and clarification cleanup in docs 2012-02-27 21:19:29 -07:00
Thomas S Hatch
707ca01952 Merge pull request #777 from grierj/contribute
Enhanced Logging For Executing User
2012-02-27 18:44:35 -08:00
Grier Johnson
14cde50cba Enhanced Logging For Executing User
Track the executing user and do some best effort work to figure out who
it is based on environment variables.  Pass the user in the payload
and allow for logging of summary information about the job the user
ran, but also allow for a raw dump of the user's target, arguments,
etc.
This aids in auditability of a user on a system trying to figure out
what made a change and when.
2012-02-27 15:39:58 -08:00
Thomas S Hatch
205cc1a5b4 Merge pull request #776 from archtaku/develop
simplify MAC address example by using network.hwaddr instead of parsing ifconfig
2012-02-27 14:55:33 -08:00
Thomas S Hatch
321887c6b8 Merge pull request #775 from grierj/contribute
syndic_cmd malforms loads to 'glob' type
2012-02-27 14:54:47 -08:00
Erik Johnson
57d417fe41 simplify MAC address example by using network.hwaddr instead of parsing ifconfig with cmd.run 2012-02-27 16:51:04 -06:00
Grier Johnson
1e23211000 The upstream load has the key tgt_type and not expr_form, this makes for
malformed loads
2012-02-27 14:45:20 -08:00
Thomas S Hatch
2f065648a1 apply wtag checks to all cmd interfaces that need them 2012-02-27 15:44:49 -07:00
Thomas S Hatch
4d586e3f6c more concise exception catch 2012-02-27 15:34:06 -07:00
Thomas S Hatch
f6fd3cbd7a Add wtag checks to the client 2012-02-27 15:19:44 -07:00
Thomas S Hatch
34be8f2c4b Add wtag checks to master 2012-02-27 15:19:28 -07:00
Thomas S Hatch
2857276b18 Add passign master's id to syndic return 2012-02-27 15:15:02 -07:00
Thomas S Hatch
71c391d771 pidfile missing from cli struct 2012-02-27 14:01:40 -07:00
Thomas S Hatch
ece2c2771e Merge branch 'develop' of github.com:saltstack/salt into develop 2012-02-27 13:49:11 -07:00
Thomas S Hatch
a74c104785 Remove redundant code 2012-02-27 13:48:48 -07:00
Thomas S Hatch
dddeca0de3 Merge pull request #774 from fatbox/mysql-module
Fix mysql __virtual__ to correctly detect config
2012-02-27 07:50:15 -08:00
Thomas S Hatch
df6a8141c7 Merge branch 'basestring' of https://github.com/fatbox/salt into fatbox-basestring
Conflicts:
	salt/state.py
2012-02-27 08:48:03 -07:00
Evan Borgstrom
e6481b875f Fix mysql __virtual__ to correctly detect config
It looks like when the following commit[1] was made it broke the mysql
module, and I haven't noticed until now some how.

My guess is that __opts__ used to look like
__opts__['mysql']['default_file'] where as it now looks like
__opts__['mysql.default_file']

[1] = b7e7cc3cb1
2012-02-27 10:43:56 -05:00
Thomas S Hatch
cb6a9ac5bb Merge pull request #771 from pille/ubuntu-packaging
updated ubuntu install doc
2012-02-27 07:14:31 -08:00
pille
aa08f8a52b updated ubuntu install doc
currently there's no single up-to-date salt-package anymore.
it has been split into pieces. wrt #711.
2012-02-27 11:44:48 +01:00
Evan Borgstrom
15e0ff5483 When using isintance to detect strings we should check for basestring
I spent the past 30 min trying to debug a problem where when a command
was published to the minion it was arriving as a string instead of a
tuple. The cmd.run module was receiving:

    {
	'arg': 'mycommand myarg1 myarg2'
	'fun': 'cmd.run',
	'jid': '20120226160155389058',
	'ret': '',
	'tgt': 'mytarget'
    }

This was causing the following exception:

    TypeError: run() takes at most 3 arguments (20 given)

I traced this down to the publish module checking for an instance of
'str' and splitting on ','.

In my instance the problem was being caused because Django likes to use
Unicode strings everywhere and the isintance was returning False.

I've replaced all instances of str with basestring in all the isintance
checks.
2012-02-26 16:11:34 -05:00
Thomas S Hatch
43de62c855 fix issue where grains don't always load static config content 2012-02-26 10:22:52 -07:00
Thomas S Hatch
0ffdcfe931 Add deprecation tot he salt -Q option 2012-02-25 23:46:30 -07:00
Thomas S Hatch
a010ffa9f3 Add deprecation warning to manpage for salt -Q 2012-02-25 23:41:41 -07:00