Commit Graph

16688 Commits

Author SHA1 Message Date
Seth House
e5ab0c9a62 Expanded on Formulas Salt version requirements 2013-08-16 23:33:21 -06:00
Thomas S Hatch
b36ea661d1 Merge pull request #6762 from billfehring/freebsd-pw_user-createhome
Support 'createhome' parameter in salt.modules.pw_user.add on FreeBSD
2013-08-16 22:09:49 -07:00
Pedro Algarvio
d66609c630 Revert "Make salt-cloud run our testrun state to get a streamed output"
This reverts commit d8b011d103.
2013-08-17 06:06:51 +01:00
Pedro Algarvio
09cb137ec7 Revert "salt-call does not support timeout"
This reverts commit 20de21df07.
2013-08-17 06:06:41 +01:00
Pedro Algarvio
2dd1cb2a83 Revert "Let's try to get the test suite output"
This reverts commit 1ab4b0ca7b.
2013-08-17 06:06:29 +01:00
Pedro Algarvio
1ab4b0ca7b Let's try to get the test suite output 2013-08-17 05:40:05 +01:00
Pedro Algarvio
20de21df07 salt-call does not support timeout 2013-08-17 05:32:32 +01:00
Pedro Algarvio
d8b011d103 Make salt-cloud run our testrun state to get a streamed output 2013-08-17 05:26:33 +01:00
Bill Fehring
940a6e489c Support 'createhome' parameter in salt.modules.pw_user.add on FreeBSD 2013-08-16 21:23:04 -07:00
Thomas S Hatch
8612a01e3b Merge pull request #6757 from viraptor/dont-show-debconf-password
Don't show debconf passwords
2013-08-16 20:54:26 -07:00
Pedro Algarvio
d1dde50a08 Merge pull request #6758 from terminalmage/issue6756
Add clarification on YAML indentation for debconf.set
2013-08-16 18:07:35 -07:00
Erik Johnson
2c51065407 Add clarification on YAML indentation for debconf.set 2013-08-16 19:46:35 -05:00
Erik Johnson
9cfeb21d14 Merge pull request #6744 from s0undt3ch/develop
Adapt the test case to the changes introduced in 7e9e889
2013-08-16 17:27:54 -07:00
Pedro Algarvio
b9ecd6102c Merge pull request #6754 from terminalmage/issue6752
Fix passing kwarg values '|' and '#'
2013-08-16 17:26:41 -07:00
Pedro Algarvio
d534d4b9a2 Merge pull request #6753 from terminalmage/issue6745
Fix functions in match module
2013-08-16 17:20:45 -07:00
Pedro Algarvio
268f716482 Merge pull request #6755 from SmithSamuelM/develop
Removed "ret' field unused from new_job_load
2013-08-16 17:05:38 -07:00
Stanisław Pitucha
09dc0cbf7d Don't show debconf passwords
Debconf options have a specific type for password, which prevents
revealing them by accident (readable only to root, stored separately,
marked explicitly as passwords). Salt shouldn't leave those values
available either. This applies to log files, console output, etc.
2013-08-17 00:40:38 +01:00
Samuel M Smith
b1b0f62613 Removed "ret' field unused from new_job_load 2013-08-16 17:11:48 -06:00
Erik Johnson
6b11f34b37 Fix passing kwarg values '|' and '#'
Due to the fact that CLI kwargs for module execution functions are
passed through yaml.safe_load, certain values get mangled. This fixes
two such values. More commits like this may arise as other cases are
found. Fixes #6752.
2013-08-16 18:10:14 -05:00
Erik Johnson
14fa3d2294 Fix versionchanged directives
I mistakenly neglected a space between the '..' and 'versionchanged'
2013-08-16 17:56:02 -05:00
Erik Johnson
601b1756c3 Fix functions in match module
Likely due to some recent changes in the matchers, the
match.grains{,_pcre}, match.pillar, and match.ipcidr functions were
broken. This commit fixes them and also adds the ability to override the
delimiter in select functions. Additionally, the caught exceptions in this
module are now being logged instead of fading into the aether.
2013-08-16 17:46:26 -05:00
Erik Johnson
8f83a55c83 Support delimiter overrides for grains{,_pcre} and pillar matchers 2013-08-16 17:46:18 -05:00
Erik Johnson
742c5f96f8 Better logging in salt.utils.subdict_match 2013-08-16 17:44:56 -05:00
David Boucha
83ba45c5a3 Merge pull request #6749 from whiteinge/filter_by-override
Allow filter_by to be overridden by pillar values
2013-08-16 15:34:58 -07:00
Seth House
c6b312bd97 Added flag to allow overriding the grains.filter_by dict with Pillar 2013-08-16 15:37:31 -06:00
Seth House
b35c74f942 Improved grains.filter_by usage example with multiple lookups 2013-08-16 15:37:31 -06:00
Seth House
3acc84fe5e Added param docs to grains.filter_by 2013-08-16 15:37:31 -06:00
Pedro Algarvio
72e94511b2 Merge pull request #6742 from terminalmage/issue6733
Fix FTP authentication in the salt fileclient
2013-08-16 12:32:18 -07:00
Pedro Algarvio
f696c5a7c6 Merge pull request #6743 from SmithSamuelM/develop
Added 'success' field to successful runner return events
2013-08-16 12:30:30 -07:00
Pedro Algarvio
0c0751e793 Adapt the test case to the changes introduced in 7e9e889 2013-08-16 20:26:48 +01:00
Samuel M Smith
d61961933d Prefix runner fun with 'runner' so round trip symmetric with api interface 2013-08-16 13:00:15 -06:00
Samuel M Smith
6b603a9cee Merge remote-tracking branch 'upstream/develop' into develop
Conflicts:
	salt/runner.py
2013-08-16 12:50:45 -06:00
Samuel M Smith
7282b88585 Added 'success' field to successful runner return events 2013-08-16 12:48:44 -06:00
Erik Johnson
046a2bf6db Fix FTP authentication in the salt fileclient
4f36393 inadvertently broke FTP authentication by stripping the username
and password from URIs and trying to use an HTTP authenticator. This
commit restricts that behavior to http(s) URIs. Fixes #6733.
2013-08-16 13:45:47 -05:00
Pedro Algarvio
7ff16157a2 Merge pull request #6738 from terminalmage/walkthrough-fix
Clarify the minion ID generation docs
2013-08-15 21:01:21 -07:00
Erik Johnson
a59b5149c6 Clarify the minion ID generation docs 2013-08-15 22:23:14 -05:00
Thomas S Hatch
378a41ab7e Merge pull request #6736 from s0undt3ch/features/reusable-warn-until
Allow other SaltStack projects to reuse `warn_until`.
2013-08-15 19:54:58 -07:00
Thomas S Hatch
58c4ecdb10 Merge pull request #6737 from s0undt3ch/hotfix/6710-skip-network-tests
Allow network related tests to be skipped if no network is available
2013-08-15 19:53:54 -07:00
Pedro Algarvio
5ea7c2ce4e Finish the obfuscation work started on e58e895. 2013-08-16 03:03:18 +01:00
Pedro Algarvio
2d06026f19 Merge pull request #6731 from s0undt3ch/develop
Remove trailing white-space and some line wrapping.
2013-08-15 18:21:33 -07:00
Seth House
a97817abfa Added note about Salt versions to formulas doc 2013-08-15 19:20:56 -06:00
Pedro Algarvio
2f750ed06c Allow network related tests to be skipped if no network is available. Fixes #6710. 2013-08-16 02:02:37 +01:00
Pedro Algarvio
1bce964105 Remove trailing white-space and some line wrapping. 2013-08-16 01:40:50 +01:00
Pedro Algarvio
7e9e889cf7 Allow other SaltStack projects to reuse warn_until. 2013-08-16 01:39:23 +01:00
Pedro Algarvio
afddbc8ee9 Merge pull request #6734 from terminalmage/issue6645
Check /etc/hostname to derive minion id
2013-08-15 16:29:32 -07:00
Erik Johnson
94b088d98c Use raw string in regex
This quiets pylint, as it complains when a regex contains a backslash
and the string is not a raw string.
2013-08-15 18:12:52 -05:00
Erik Johnson
ce9b2728a0 Add documentation on how the minion id is derived 2013-08-15 18:03:38 -05:00
Erik Johnson
f0240de257 Check /etc/hostname before socket.getfqdn() in get_id()
This fixes #6645 by checking /etc/hostname first before trying
socket.getfqdn().
2013-08-15 18:00:40 -05:00
Seth House
506ad11889 Added missing 'eauth' to LocalClient as an optional kwarg 2013-08-15 16:28:51 -06:00
Seth House
bb8e617c57 Quiet Sphinx warning for deprecated Python API doc 2013-08-15 16:15:49 -06:00