Commit Graph

14499 Commits

Author SHA1 Message Date
Joseph Hall
295b883d8a Merge pull request #5754 from cvrebert/patch-2
salt.utils: fix pylint W0702 "No exception type(s) specified"
2013-06-26 11:51:43 -07:00
Joseph Hall
b7b738ded6 Merge pull request #5756 from cvrebert/patch-4
salt.payload: fix pylint W0702 "No exception type(s) specified"
2013-06-26 11:48:43 -07:00
Joseph Hall
0fee4c11bf Merge pull request #5757 from cvrebert/patch-5
salt.crypt: fix pylint W0702 "No exception type(s) specified"
2013-06-26 11:48:28 -07:00
Joseph Hall
8ed129f1e2 Merge pull request #5755 from cvrebert/patch-3
states.sysctl: add spaces after commas to fix pylint C0324
2013-06-26 11:48:02 -07:00
Joseph Hall
efd9f35742 Merge pull request #5751 from terminalmage/issue5733
Limit to one pkg.refresh per salt run
2013-06-26 11:44:39 -07:00
Chris Rebert
30bffb9c02 salt.crypt: fix pylint W0702 "No exception type(s) specified" 2013-06-26 11:44:21 -07:00
Chris Rebert
9a093c96bc salt.payload: fix pylint W0702 "No exception type(s) specified" 2013-06-26 11:43:10 -07:00
Chris Rebert
55ef66289f states.sysctl: add spaces after commas to fix pylint C0324 2013-06-26 11:40:35 -07:00
Chris Rebert
a34b4cc065 salt.utils: fix pylint W0702 "No exception type(s) specified" 2013-06-26 11:38:01 -07:00
Erik Johnson
29798a8bce Make pkg state refresh if rtag exists
After further discussion with Tom, the intent is that there is a single
pkg.refresh_db each salt run. This commit reverts that particular change
from the previous commit.
2013-06-26 13:09:29 -05:00
Erik Johnson
439c736e32 Only run refresh_db once per salt run
As presently contstructed, pkg.refresh_db is run for every call of every
pkg.installed and pkg.latest state, and the refresh param for these
states is ignored.

This commit fixes it so that the rtag isn't created for every call, and
that a pkg.refresh_db is only done when refresh == True and the rtag
exists. After the install is run, the rtag is removed, keeping
pkg.refresh_db from being run in subsequent pkg states within the same
state.sls or state.highstate.
2013-06-26 12:17:59 -05:00
Thomas S Hatch
b67653b7e4 Merge pull request #5744 from s0undt3ch/features/cli-tools-logging
Complete cli tools logging
2013-06-26 09:57:30 -07:00
Thomas S Hatch
92457ae21a Merge pull request #5740 from s0undt3ch/issues/5706-runners-logging
Setup logging on salt's runner `CLI` access. Fixes #5706.
2013-06-26 09:56:12 -07:00
Joseph Hall
2b1af0d34f Merge pull request #5747 from slai/develop
Fixed a typo in the default logfile name for the minion.
2013-06-26 08:11:15 -07:00
Sam
24fd8a5cb8 Fixed a typo in the default logfile name for the minion. 2013-06-27 00:49:56 +10:00
Thomas S Hatch
a61069f5e8 Merge pull request #5736 from ranl/develop
fix mine while caching is disabled
2013-06-26 07:45:13 -07:00
Joseph Hall
430613e6fb Merge pull request #5738 from s0undt3ch/develop
Double to single quotes & No tabs!
2013-06-26 07:38:47 -07:00
Pedro Algarvio
0d129aaf0b Make sure the tools that were not supposed to have logging output don't get the console logging settings from the master and minion defaults. 2013-06-26 12:23:20 +01:00
Pedro Algarvio
7e47ae8ce3 Even for salt-key the log file setting should be checked to see if it's not directed to syslog. 2013-06-26 11:44:21 +01:00
Pedro Algarvio
0be1567eac Check if verify_env is true. 2013-06-26 11:43:47 +01:00
Pedro Algarvio
0091fda5bf salt-cp binary now supports logging tweaking from the console.
Default log level is `warning`, though, since the master configuration file is shared, whatever `log_level` is defined on the master configuration file that's the value that will be used. To tweak the `salt-cp` log level on the configuration file, independently from the master, you can use cli_salt_cp_log_level(See #5609).
2013-06-26 11:34:59 +01:00
Pedro Algarvio
07bfe46c72 SaltCMD, ie, salt binary now support logging tweaking from the console.
Default log level is warning, though, since the master configuration file is shared, whatever the log_level defined on the master configuration file that's the value that will be used. To tweak the salt-run log level on the configuration file, independently from the master, you can use cli_salt_log_level(See #5609).
2013-06-26 11:28:51 +01:00
Pedro Algarvio
86bd478370 Setup logging on salt's runner CLI access. Fixes #5706.
Default log level is `warning`, though, since the master configuration file is shared, whatever the `log_level` defined on the master configuration file that's the value that will be used. To tweak the `salt-run` log level on the configuration file, independently from the master, you can use `cli_salt_run_log_level`(See #5609).
2013-06-26 10:57:14 +01:00
Pedro Algarvio
a3f0dd3892 No tabs! 2013-06-26 10:37:14 +01:00
Pedro Algarvio
ad0639e416 Double to single quotes. 2013-06-26 08:27:22 +01:00
David Boucha
ec2d260ab0 Merge pull request #5735 from terminalmage/issue3321
Make shadow support work in FreeBSD, NetBSD
2013-06-25 23:47:40 -07:00
Erik Johnson
efad953df8 Slight tweak to _shadow_supported()
When this function was added, Solaris support was improperly defined.
This commit fixes that.
2013-06-26 00:46:14 -05:00
Erik Johnson
764667a57d Update docstring to reflect updated shadow support 2013-06-26 00:38:44 -05:00
Erik Johnson
af202491de Make shadow support work in FreeBSD, NetBSD
This commit uses the new shadow modules for FreeBSD and NetBSD, as well
as updates the logic to only support shadow support where it is
supported.
2013-06-26 00:38:44 -05:00
Erik Johnson
586f213f13 add netbsd shadow module 2013-06-26 00:38:44 -05:00
Erik Johnson
01bcda4326 add freebsd shadow module 2013-06-26 00:38:44 -05:00
Erik Johnson
508d8166a8 Normalize the 'pwd' field in shadow.info output
This makes this field match the corresponding field in user.info. This
also updates the docstring for set_password to be more descriptive.
2013-06-26 00:38:44 -05:00
Erik Johnson
62391367df Normalize the 'pwd' field in shadow.info output
This makes this field match the corresponding field in user.info.
2013-06-26 00:38:44 -05:00
Erik Johnson
7681dc4a6a Add stdin support for cmd module
This commit adds the ability to specify stdin for the command that you
are running. This allows for more secure running of commands which
require sensitive info be piped into them.
2013-06-26 00:38:44 -05:00
Thomas S Hatch
8c70a0e503 looks like this should be false since no changes are pending 2013-06-25 22:24:48 -06:00
Thomas S Hatch
b0a5478b3f fix spacing 2013-06-25 22:21:16 -06:00
Thomas S Hatch
95572feae4 Move trans into place 2013-06-25 22:21:16 -06:00
Thomas S Hatch
4d980d4521 Merge pull request #5731 from mlister2006/develop
Bugs fixed for the test conditions for states.sysctl
2013-06-25 21:20:22 -07:00
Thomas S Hatch
561b9d267b no crypto needed for local mode 2013-06-25 21:43:21 -06:00
Thomas S Hatch
237d560fc8 No zmq for local mode 2013-06-25 21:42:16 -06:00
Thomas S Hatch
200f0c3e5e no zmq for local mode 2013-06-25 21:40:35 -06:00
Thomas S Hatch
dee6fa92b2 Allow running salt-call without zmq 2013-06-25 21:39:43 -06:00
Thomas S Hatch
ba755806cd Allow zmq-less deployment 2013-06-25 20:58:33 -06:00
Thomas S Hatch
3292cc43e6 Still load without all deps 2013-06-25 20:56:05 -06:00
mlister2006
a313c897ff Update sysctl.py 2013-06-25 17:39:40 -04:00
mlister2006
4a1add835e Update sysctl.py
Bugs fixed for the test conditions:
1. Corrected if-else logic, for already correct sysctl option setup before.
2. Added test logic: If state file is trying to setup invalid sysctl option, that is not supported by the minion's kernel.
2013-06-25 17:36:53 -04:00
Thomas S Hatch
7a70f5d660 Start on trans module system with experimental ssh module 2013-06-25 15:05:49 -06:00
ran
38aa906da0 fix mine while caching is disabled 2013-06-25 23:42:09 +03:00
Thomas S Hatch
552a9f0a3c Merge pull request #5728 from basepi/minionstart5670
Sleep to allow minion to catch up on startup, Fixes #5670
2013-06-25 12:38:19 -07:00
Thomas S Hatch
26f83a9404 Merge pull request #5727 from chideit/file-mode-none
Better fix for #5725 since this was also happening in directory and symlink stanzas.
2013-06-25 12:37:51 -07:00