Denys Havrysh
7d940aed1f
states.file: fix indentation in YAML examples ( #34003 )
2016-06-14 11:24:07 -04:00
Mike Place
c429483813
Starting on loader documentation ( #33999 )
...
* More work
* More lazyloader docs
2016-06-14 11:23:17 -04:00
Nicole Thomas
871f7966ce
Lint fix for #34000 ( #34005 )
2016-06-14 11:12:14 -04:00
Mike Place
f758e42172
Fix incorrectly written test ( #34000 )
...
This should be using the test suite method of generating opts
2016-06-14 11:10:21 -04:00
Loren Gordon
4c7fac0aaa
Remove loader test for pam module ( #34002 )
...
The test in the virtual function was unnecessary. The pam module
does not itself rely on any external python or pam libraries. The
only function present, pam.read_file(), accepts a file name as a
parameter, checks if it exists, and parses the file. There is no
reason to avoid loading the module.
Fixes #20809
2016-06-14 11:07:52 -04:00
Bo Maryniuk
2dc9e693f5
Fix lint
2016-06-14 16:37:11 +02:00
Bo Maryniuk
ef84253e7e
Fix netmask test.
2016-06-14 16:34:44 +02:00
Bo Maryniuk
ffeaff003f
Fix typo
2016-06-14 16:33:18 +02:00
Bo Maryniuk
22f3bab2ca
Fix the documentation
2016-06-14 16:29:07 +02:00
Bo Maryniuk
085901470e
Add unit test check for non-localhost IP is accepted as a minion ID
2016-06-14 16:29:07 +02:00
Bo Maryniuk
bce6798e86
Add unit test to check if any of localhost or local IP addresses are filtered
2016-06-14 16:29:07 +02:00
Bo Maryniuk
47755c69ea
Add unit test to filter out localhost from the first occurrence
2016-06-14 16:29:07 +02:00
Bo Maryniuk
15ecb083e3
Add test for the first in line from platform.node is used (mostly)
2016-06-14 16:29:06 +02:00
Bo Maryniuk
eed433ec60
Add unit test to check on duplicate hostnames in the pool
2016-06-14 16:29:06 +02:00
Bo Maryniuk
71a3e91f57
Add unit test for check if the minion ID is distinct in the pool
2016-06-14 16:29:06 +02:00
Bo Maryniuk
873811c1aa
Make generate_minioin_id more testable.
2016-06-14 16:29:06 +02:00
Bo Maryniuk
35740ce4fa
Get hostname as an attribute of a raw socket.
2016-06-14 16:29:06 +02:00
Bo Maryniuk
a3266c6f2f
Fix network test for Solaris
2016-06-14 16:29:06 +02:00
Bo Maryniuk
2d4a9939a9
Rename network unit test into a proper name
2016-06-14 16:29:06 +02:00
Bo Maryniuk
c357a80038
Use FQDN at last, as it may differ
2016-06-14 16:29:06 +02:00
Bo Maryniuk
043ae8bd92
Use api of the distinct list
2016-06-14 16:29:06 +02:00
Bo Maryniuk
cf1433b8e1
Rewrite generate_minion_id function
2016-06-14 16:29:06 +02:00
Bo Maryniuk
49aa659bd5
Fix logical expression
2016-06-14 16:29:05 +02:00
Bo Maryniuk
d8a912ccdf
Keep order on deduplication
2016-06-14 16:29:05 +02:00
Bo Maryniuk
6d21f50a73
Remove hostname sorting
2016-06-14 16:29:05 +02:00
Pablo Suárez Hernández
50175a0103
one clause to set OS grain from CPE_NAME
2016-06-14 09:39:31 +01:00
Bo Maryniuk
e36821510f
Fix documentation: add an example how to export system to the Kiwi
2016-06-14 09:40:51 +02:00
Bo Maryniuk
fe300ccf73
Lintfix
2016-06-14 09:39:04 +02:00
Mike Place
1c728b264d
Merge pull request #33996 from cachedout/fix_develop_stacktrace
...
Fix develop stacktrace
2016-06-13 19:56:45 -07:00
jizhilong
1f24bb558c
fix redis_return's clean_old_jobs.
...
Refs #33969
2016-06-14 10:46:17 +08:00
Mike Place
2df2844831
Fix unsupported syntax on py2.7
...
Prevents this stacktace:
mp@silver ...devel/salt/tests % sudo ./runtests.py -h (git)-[develop]
Traceback (most recent call last):
File "./runtests.py", line 14, in <module>
from integration import TestDaemon, TMP # pylint: disable=W0403
File "/home/mp/devel/salt/tests/integration/__init__.py", line 62, in <module>
import salt.minion
File "/home/mp/devel/salt/salt/minion.py", line 88, in <module>
import salt.pillar
File "/home/mp/devel/salt/salt/pillar/__init__.py", line 16, in <module>
import salt.fileclient
File "/home/mp/devel/salt/salt/fileclient.py", line 32, in <module>
import salt.utils.s3
File "/home/mp/devel/salt/salt/utils/s3.py", line 168
except (KeyError, ET.ParseError), err:
2016-06-13 20:12:36 -06:00
Mike Place
1132bc5d0b
Merge pull request #33995 from jacobhammons/doc-fixes
...
Understanding Jinja topic, Jinja doc issues.
2016-06-13 19:00:29 -07:00
Mike Place
e797b42ad9
Merge pull request #33989 from thatch45/t_fall
...
Enable transport fallback
2016-06-13 18:16:21 -07:00
Mike Place
c4dab6a074
Merge pull request #33990 from jacobhammons/community-projects
...
Adds links to several current Salt-related projects
2016-06-13 18:15:20 -07:00
Mike Place
444c15792c
Merge pull request #33983 from twangboy/fix_docs_join_domain
...
Clarify the `account_exists` parameter
2016-06-13 18:11:48 -07:00
Mike Place
a400f6a6c3
Merge pull request #33900 from amendlik/gitfs-hook-doc
...
Document sudo policy for gitfs post-recieve hook
2016-06-13 18:04:35 -07:00
Mike Place
d8d2b2ee9e
Merge pull request #33919 from thatch45/cmd_filter
...
Cmd filter
2016-06-13 18:03:21 -07:00
Mike Place
d3b4daad7f
Merge pull request #33973 from rbjorklin/add-consul-pillar-arguments
...
Dynamically support params in Consul function call
2016-06-13 17:54:04 -07:00
Mike Place
32c4f54ea6
Merge pull request #33889 from hrumph/exit3010
...
3010 exit codes Remembered for boot session
2016-06-13 17:50:39 -07:00
Mike Place
9bd2317992
Merge pull request #33951 from jfindlay/gem_tests
...
modules.gem int tests: more fixes
2016-06-13 17:46:43 -07:00
Mike Place
28c886edd0
Merge pull request #33980 from twangboy/fix_build
...
Use full path to python.exe
2016-06-13 17:46:14 -07:00
Mike Place
53baae6eb1
Merge pull request #33984 from jfindlay/disk_capacity
...
Add docs and tests to disk state
2016-06-13 17:43:38 -07:00
Mike Place
fa5efb6a69
Merge pull request #33985 from rallytime/more-batch-tests
...
Write some more simple batch command tests
2016-06-13 17:38:05 -07:00
Mike Place
25657b0844
Merge pull request #33991 from rallytime/cleanup-33982
...
Clean up boto_sqs module CLI formatting and add version to new funcs
2016-06-13 17:31:48 -07:00
Mike Place
26fee377ec
Merge pull request #33993 from s0undt3ch/2016.3
...
Call `sys.exit()` instead of `exit()`
2016-06-13 17:30:46 -07:00
Jacob Hammons
887a415138
Adds new Understanding Jinja topic, and fixes several Jinja doc issues.
...
Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability.
Refs #12470
Refs #10206
Refs #10480
Refs #23522
Refs #33023
2016-06-13 18:30:42 -06:00
twangboy
b057be04b4
Fix typo, more documentation
2016-06-13 18:07:22 -06:00
Nicole Thomas
3972dbc773
Lint fix for develop branch ( #33992 )
2016-06-13 19:50:35 -04:00
Pedro Algarvio
34f7d90d9f
Call sys.exit()
instead of exit()
2016-06-14 00:34:38 +01:00
Nicole Thomas
840102d624
Protect the vboxapi import more carefully ( #33722 )
...
* Protect the vboxapi import more carefully
Fixes #33720
* Pylint fix
2016-06-13 19:25:19 -04:00