Commit graph

6725 commits

Author SHA1 Message Date
Pedro Algarvio
c976e4222c include tests/integration/tmp/_README no longer exists. Remove it from MANIFEST.in. 2012-10-05 02:10:33 +01:00
Pedro Algarvio
b2a0b6e5fb Merge branch 'develop' of github.com:saltstack/salt into develop 2012-10-05 00:58:58 +01:00
Pedro Algarvio
b6cb78364f Switch integration tmp to the system's temporary directory.
While running the tests within a VirtualBox(vagrant) machine, if the salt source is mounted using shared folders, any tests involving hard links WILL fail. Any tests involving symlinks, can be made to work by setting some properties on the VirtualBox shared folder. By moving the tests `tmp` directory to `tempfile.gettempdir()` we avoid this false test case errors.
2012-10-05 00:52:00 +01:00
Thomas S Hatch
93d87db1a5 update the publish method to use the new structure that is being passed in 2012-10-04 17:12:58 -06:00
Thomas S Hatch
5616b0fb57 Finish linking in the kwargs 2012-10-04 17:05:28 -06:00
Thomas S Hatch
cfba5edfbb Link in kwargs 2012-10-04 16:29:39 -06:00
Thomas S Hatch
626c9b80e0 Make the client accept kwargs and pass them on 2012-10-04 16:11:30 -06:00
Thomas S Hatch
c11240356c Merge pull request #2164 from whiteinge/salt-refactor-client-cmds
Salt refactor client cmds
2012-10-04 14:51:36 -07:00
Thomas S Hatch
382ab38e45 Merge pull request #2169 from seanchannel/develop
stop respawning
2012-10-04 14:26:36 -07:00
Sean Channel
4f828f68d8 stop respawning 2012-10-04 14:22:12 -07:00
Sean Channel
17ed662507 stop respawning
we are not tty login program (getty).
2012-10-04 14:20:40 -07:00
Thomas S Hatch
6bbef3df8e Merge pull request #2168 from archtaku/develop
Add Subnet/IP address matcher
2012-10-04 13:16:04 -07:00
Thomas S Hatch
11eb9f18d7 Merge pull request #2165 from seanchannel/develop
Update doc/ref/clientacl.rst
2012-10-04 12:56:53 -07:00
Erik Johnson
3eed6c857e Add Subnet/IP address matcher
This implements #653. Note that there appears to be an underlying
problem with how highstates instantiate Matcher objects, which is
keeping this from working in an SLS file. See issue #2167 for more
details on that.
2012-10-04 13:02:59 -05:00
Sean Channel
22baa7ca69 Update doc/ref/clientacl.rst
delete extra 's' on the key removal
2012-10-04 10:48:12 -07:00
Seth House
1376da9706 Refactored out repeated code in the various cmd_* LocalClient methods 2012-10-04 11:37:50 -06:00
Seth House
9827122267 Added reusable helpers for sending a pub and checking the return 2012-10-04 11:37:50 -06:00
Thomas S Hatch
94ac95fe40 Merge pull request #2163 from FireHost/add_ext_pillar_stacktrace
Add stack trace to ext_pillar load failures.
2012-10-04 09:27:23 -07:00
Thomas S Hatch
bd663831e9 Merge pull request #2161 from marcinkuzminski/patch-3
fixes for mysql user_exists function
2012-10-04 09:16:26 -07:00
Thomas S Hatch
ab294b19e7 Merge pull request #2160 from archtaku/develop
Implement #2114, fix group-handling bugs
2012-10-04 09:10:52 -07:00
Aaron Tygart
e6af1f9472 Add stack trace to ext_pillar load failures. 2012-10-04 10:57:09 -05:00
Marcin Kuźmiński
2c5b7d8908 Update salt/modules/mysql.py
fixed query formatting on user_exists that caused this function to always fail
2012-10-04 13:01:42 +03:00
Erik Johnson
9268295895 apparently sorted() was needed after all 2012-10-04 03:10:59 -05:00
Erik Johnson
8ed7e05ab4 Fix group-handling edge case
This commit fixes errors when either groups or optional_groups is not
specified in the user.present state.
2012-10-04 03:05:17 -05:00
Erik Johnson
618a8252fc remove unnecessary call to sorted() 2012-10-04 02:46:24 -05:00
Erik Johnson
f6908b90c5 Implement #2114, fix group-handling bugs
This commit accomplishes the following tasks:

1) #2114 is implemented, bringing an "optional_groups" parameter to the
   user.present state.

2) salt/modules/{groupadd,pw_group}.py had a bug in the "info" function
   which resulted in a traceback when called for a nonexistant group.
   This is now fixed.

3) A major bug with group handling in the user.present state has been
   fixed. See the below comment for a detailed explanation of the bug.

https://github.com/saltstack/salt/issues/2114#issuecomment-9132470
2012-10-04 02:32:52 -05:00
Thomas S Hatch
3430b4ede2 Fix external_auth to reflect current capabilities 2012-10-04 00:11:16 -06:00
Thomas S Hatch
73b654591d New vimrc needs some love... 2012-10-04 00:03:55 -06:00
Thomas S Hatch
283749d61a I do this too often... 2012-10-04 00:00:16 -06:00
Thomas S Hatch
039e367ebe Add external_auth to master default config 2012-10-03 23:55:28 -06:00
Thomas S Hatch
a1b67950ad Add eauth hook to use external auth calls 2012-10-03 23:52:30 -06:00
Thomas S Hatch
7ad4210ed1 Add safety to auth 2012-10-03 23:26:24 -06:00
Thomas S Hatch
01c3e3986b Add load_name method to auth 2012-10-03 23:24:23 -06:00
Thomas S Hatch
2fc9285302 Merge pull request #2159 from rentalita/0.10.3
0.10.3
2012-10-03 21:33:41 -07:00
Tom Vaughan
f7af7051f7 she who creates the debian package must be listed in the changelog 2012-10-04 01:19:20 -03:00
Tom Vaughan
88e2ad1e9c bump 2012-10-04 01:16:27 -03:00
Thomas S Hatch
f49ae7007e Merge pull request #2158 from KrisSaxton/develop
added LDAP module and ext_pillar backend
2012-10-03 17:14:18 -07:00
Kris Saxton
0c157c5ea4 added LDAP module and ext_pillar backend 2012-10-04 00:19:18 +01:00
Thomas S Hatch
9fc283b89b Merge pull request #2157 from s0undt3ch/issues/2151
Fix #2151
2012-10-03 16:10:25 -07:00
Pedro Algarvio
2b60f0f93c Log a message if neither dmidecode not lspci produce output. Refs #2151. 2012-10-03 23:34:24 +01:00
Pedro Algarvio
6db627a829 Fix bug from last commit, quiet not defined on run_all. 2012-10-03 22:20:26 +01:00
Pedro Algarvio
221e9dc11f Warn the user about grains not accurate in some situations and try to work around that. Fixes #2151.
* Worked around the egg and the chicken problem regarding imports so that we can log on the grains module.
* Added `salt.modules.cmdmod._run_all_quiet` which mimics `salt.modules.cmdmod._run_quiet` except it returns the whole command run info dict.
* If `dmidecode` is not executed properly, default to `lspci` instead of producing bad results.
2012-10-03 22:15:47 +01:00
Thomas S Hatch
ad6f2b84fb Merge branch 'develop' of github.com:saltstack/salt into develop 2012-10-03 14:04:59 -06:00
Thomas S Hatch
f75427b13e Add tops package to setup.py 2012-10-03 14:04:41 -06:00
Thomas S Hatch
dbed504d17 Add tops package to setup.py 2012-10-03 13:58:08 -06:00
Thomas S Hatch
dca280a232 Add auth package to setup.py 2012-10-03 13:57:36 -06:00
Thomas S Hatch
06d1bf52fd Merge pull request #2156 from herlo/develop
moved salt.spec to 0.10.3 and added systemd scriptlets
2012-10-03 09:56:41 -07:00
Clint Savage
0086c9d48c moved salt.spec to 0.10.3 and added systemd scriptlets 2012-10-03 10:29:00 -06:00
Thomas S Hatch
ea23a6db6a Merge pull request #2155 from herlo/develop
salt should pass numbers appropriately, but just in case
2012-10-03 09:27:31 -07:00
Thomas S Hatch
66e89045f5 Add new auth object to clearfuncs in the master 2012-10-02 16:33:57 -06:00