Harley Pig
848af122dd
added opts to grains if set in configuration
2012-08-16 13:18:05 -06:00
Thomas S Hatch
3ddb66bedf
restore low chink execution
2012-08-15 22:41:01 -06:00
Thomas S Hatch
25811911dc
Move state_verbose into the outputter
2012-08-15 22:31:50 -06:00
Thomas S Hatch
72ed9d1872
single quotes
2012-08-15 22:21:29 -06:00
Thomas S Hatch
16565484c4
Add brief doc on sending SIGUSR1
2012-08-15 22:05:06 -06:00
Thomas S Hatch
0c1b60d710
Fix pillar checks for minion that are pre "os_family"
2012-08-15 18:46:24 -06:00
Thomas S Hatch
6c0cf5891e
Fix user assignment to acl access keys
2012-08-14 23:46:49 -06:00
Thomas S Hatch
5b53c17f9b
Allow the master to fallback on jid creation
2012-08-14 23:45:07 -06:00
Thomas S Hatch
d62f685241
user access files need to be available
2012-08-14 23:22:40 -06:00
Thomas S Hatch
daa04eb1ca
read in the correct keyfile
2012-08-14 23:15:19 -06:00
Thomas S Hatch
0c9f8bf47d
fix arg passing in verify_env
2012-08-14 23:04:56 -06:00
Thomas S Hatch
cdf5394066
Modify verify_env to only work on the pki_dir
2012-08-14 23:01:25 -06:00
Thomas S Hatch
1fc70c4835
It is always the one liners
2012-08-14 22:39:34 -06:00
Thomas S Hatch
1df9348c5f
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-08-14 22:38:04 -06:00
Thomas S Hatch
3113c53643
Add client_acl to config
2012-08-14 22:37:51 -06:00
Thomas S Hatch
bbc4adb996
Initial commit for ACL support
2012-08-14 22:36:49 -06:00
Thomas S Hatch
300723cbb4
Merge pull request #1824 from grierj/contribute
...
Fix bug in peer publishing jobs.lookups_jid
2012-08-14 21:07:53 -07:00
Grier Johnson
20465621e0
Revert "Allow permissive access to the cached root key."
...
This reverts commit 591f7b861e
.
Not a fan of this right now, trying to rethink it
2012-08-14 19:39:06 -07:00
Grier Johnson
3d9f43b15b
Fix bug in peer publishing jobs.lookups_jid
...
When the argument passed is entirely numeric ast.literal_eval()
will evaluate the numeric string to a int, long or float. This
falls through the attempt to create a list of arguments and later
causes runner.run to fail when the argument is a string.
2012-08-14 19:11:53 -07:00
Thomas S Hatch
d4ff968113
Merge pull request #1823 from mrud/mru/test_os_family
...
Add test to test if os_family grain is provided.
2012-08-14 18:55:09 -07:00
Ulrich Dangel
7176ec5d4a
Add test to test if os_family grain is provided.
...
Corey Quinn reported a issue where __grains__['os_family'] returned a
KeyError. This commits adds a check to the grains module test to ensure
os_family is present.
2012-08-15 02:59:03 +02:00
Thomas S Hatch
a9955dfc64
Add a sudo before the user that is calling
...
This is so that we can start getting ACLs in there, the user field will
be used to pass actual user data to the acl system
2012-08-14 18:56:39 -06:00
Thomas S Hatch
af7b649495
Merge pull request #1822 from bretep/feature/Issue-1817
...
Feature/issue 1817
2012-08-13 22:38:06 -07:00
Bret Palsson
91046468a0
Rewind StringIO and then readlines
2012-08-13 23:27:15 -06:00
Bret Palsson
8681c9732e
Clear up confusing output
2012-08-13 23:19:04 -06:00
Bret Palsson
579949674c
Use readlines() for StringIO
2012-08-13 23:17:52 -06:00
Bret Palsson
dda1524818
Improve test functionality and readability
2012-08-13 23:06:10 -06:00
Bret Palsson
535a6a1d53
Write to StringIO object vs. file
2012-08-13 23:04:45 -06:00
Thomas S Hatch
1a61e1e158
Merge pull request #1819 from s0undt3ch/develop
...
Allow the parsers to choose their default logging level.
2012-08-13 20:43:22 -07:00
Pedro Algarvio
38fee9deac
Properly show the default log level when issuing -h
on a parser.
2012-08-14 04:32:57 +01:00
Pedro Algarvio
b5761c97d1
Allow the parsers to choose their default logging level.
...
* Based on the conversation on saltstack/salt#1818 there was a need to allow the parsers to specify their default logging level. Now Supported!
* When connecting to the master, the log message now tells us, which(hostname or ip) is the master that we're connecting to.
2012-08-14 04:27:18 +01:00
Thomas S Hatch
be267380c7
Merge branch 'develop' of github.com:saltstack/salt into develop
2012-08-13 18:53:00 -06:00
Thomas S Hatch
2b085cbb4c
Fix #1337
2012-08-13 18:52:34 -06:00
Thomas S Hatch
501d4f760a
Merge pull request #1818 from s0undt3ch/develop
...
Update `HACKING.rst`
2012-08-13 17:28:32 -07:00
Thomas S Hatch
9cab50c5ae
Fix #1330
...
Sorry about the long wait on this one, it fell off the radar!
2012-08-13 18:24:16 -06:00
Pedro Algarvio
30c7f190c7
Merge branch 'develop' of git://github.com/saltstack/salt into develop
2012-08-14 00:48:43 +01:00
Pedro Algarvio
26d6c13255
Update HACKING.rst
to use --config-dir
and let users know how to better control running the tests.
2012-08-14 00:47:28 +01:00
Bret Palsson
4582660dc2
Syntax error, yank yank paste!
2012-08-13 17:27:27 -06:00
Thomas S Hatch
495fc2dc1d
Fix syntax error in parsers
2012-08-13 17:27:21 -06:00
Bret Palsson
7d52bb3b0b
Diff changes
2012-08-13 17:23:35 -06:00
Bret Palsson
705754aca4
Don't apply network states when test=true ( #1817 )
2012-08-13 17:10:01 -06:00
Thomas S Hatch
937bd5b67d
don't merge ext_nodes with pillar lookup, fix #1816
2012-08-13 16:28:41 -06:00
Grier Johnson
2083d67d46
Merge remote branch 'upstream/develop' into contribute
...
* upstream/develop: (133 commits)
Add a verify_env option to the master and minion configs
clean up some double quotes
Fix #1790 by moving generic sanitize_host function into shared lib
Single quotes
Add Hacking file to source tarball, fix #1767
Fix #1753 , really
Should fix #1813 , please let me know
Fix `salt-call` bug with default outputter.
There's no logging NullHandler in `2.6`. Fix it.
Final fix for saltstack/salt#1756
Complete fix saltstack/salt#1806
Some more fixes regarding saltstack/salt#1756
Fix `tests/unit/utils/verify_test.py` since verify_user no longer accepts the log argument.
Fix saltstack/salt#1756
Fix saltstack/salt#1804
Fix salstack/salt#1789
added bash completion script
Make sure the configuration directory path is absolute.
Some more parsers cleanup and fixes.
Make sure the configuration directory path is absolute.
...
2012-08-13 15:20:55 -07:00
Thomas S Hatch
34eaf1f26c
Add a verify_env option to the master and minion configs
2012-08-13 15:44:16 -06:00
Thomas S Hatch
1d7c812023
clean up some double quotes
...
parsers.py still needs more .format action and fewer double quotes
2012-08-13 15:32:32 -06:00
Thomas S Hatch
98090c3067
Fix #1790 by moving generic sanitize_host function into shared lib
2012-08-13 09:45:49 -06:00
Thomas S Hatch
cef24d6c8f
Single quotes
2012-08-13 09:44:01 -06:00
Thomas S Hatch
357c9eefab
Add Hacking file to source tarball, fix #1767
2012-08-13 09:38:36 -06:00
Thomas S Hatch
577543e002
Fix #1753 , really
2012-08-13 09:27:34 -06:00
Thomas S Hatch
e38ff86c33
Should fix #1813 , please let me know
2012-08-13 09:17:02 -06:00