valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
37,165 Commits 24 Branches 182 Tags 341 MiB
8e691d7f32
Commit Graph

37165 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colton Myers
7097cfd4dc Merge pull request #18770 from basepi/publish-prevent-fulldata 
[2014.7] Prevent all `publish.` calls from publish calls
 2014-12-08 10:14:17 -07:00
Elias Probst
10122c38eb Handle 'target' + 'action_parameter' in 'set_target()' correctly. 2014-12-08 17:58:20 +01:00
Elias Probst
384765295b Deprecate 'parameter' in favour of 'module_parameter'/'action_parameter'. 
A generic 'parameter' argument doesn't cover what's actually required.
In some cases, parameters need to be passed either to the executed
module, action or both.

This changes gracefully deprecate the old 'parameter'.
 2014-12-08 17:58:20 +01:00
Elias Probst
73999ba2e3 Added 'parameter' to CLI examples. 2014-12-08 17:58:20 +01:00
Elias Probst
6b67b09fbd Strip additional output from targets, return only actual targets. 2014-12-08 17:58:20 +01:00
Elias Probst
470ebdfd10 Only return cleaned-up module names. 
- strip module descriptions
- strip indentation from list output
- strip internal modules (help, usage, version)
 2014-12-08 17:58:20 +01:00
Elias Probst
d3ca411b47 Add support for 'parameter' where appropriate. 2014-12-08 17:58:13 +01:00
Erik Johnson
00bf5daff8 Add bugfix for #17963 to 2014.7.1 releae notes 2014-12-08 08:45:03 -06:00
Erik Johnson
fd604d1aba Fix jinja search path for local file_client 
Now that FS backends other than roots work with a local file_client,
there is no need to look only in the file_roots directories.

Fixes #17963.
 2014-12-08 08:38:22 -06:00
Elias Probst
54d68d9c69 Don't run 'exec_action' blindly. 2014-12-07 20:40:38 +01:00
Joseph Hall
2244ec34d0 Merge pull request #18779 from sjansen/patch-2 
Restore salt-cloud ssh_gateway support
 2014-12-06 21:03:06 -07:00
rallytime
9e5350c2f4 Fix markup so master_tops document will render correctly 
Fixes #18723
 2014-12-05 20:47:41 -07:00
rallytime
6fa344c0f9 Add pymongo requirement notification to mongodb_user state 
Fixes #18756
 2014-12-05 20:34:49 -07:00
Stuart Jansen
29b08250cf Restore salt-cloud ssh_gateway support 2014-12-05 20:28:03 -07:00
Joseph Hall
346dd0b2dd Merge pull request #18777 from UtahDave/2014.7local 
2014.7local
 2014-12-05 18:23:00 -07:00
David Boucha
b89f0dba70 remove old commented out code 2014-12-05 16:24:21 -07:00
David Boucha
1836ed2f78 expand user home directory before using. 
Fixes #18670
 2014-12-05 16:21:20 -07:00
Colton Myers
eaf6d35163 Wait for full_data returns as well 2014-12-05 15:32:27 -07:00
rallytime
5636af6572 Use a list instead of a tuple when running dpkg-query command 2014-12-05 14:01:20 -07:00
Colton Myers
0074842711 Prevent all publish. calls from publish calls 2014-12-05 13:11:30 -07:00
Gareth J. Greenaway
fd35eaf52c Fixing an bug that was introduced related to adding new mount options which caused fstab to not be written out. 2014-12-05 09:58:47 -08:00
Thomas S Hatch
52db8f790f Merge pull request #18754 from terminalmage/issue18710 
Fix lint error, uncomment log message
 2014-12-04 16:50:49 -07:00
Thomas S Hatch
2415142616 Merge pull request #18753 from basepi/state-output-salt-call 
[2014.7] Move state_output CLI option to Output mixin
 2014-12-04 16:50:22 -07:00
Thomas S Hatch
6874f737b3 Merge pull request #18747 from basepi/saltssh-state-cleanupfix 
[2014.7] Normalize cleanup and return routines for state wrappers in salt-ssh
 2014-12-04 16:50:11 -07:00
Thomas S Hatch
6409927429 Merge pull request #18691 from rallytime/grains_selinux_change 
Change cmd.run to cmd.retcode for selinuxenabled check
 2014-12-04 16:40:30 -07:00
rallytime
d11ee47bbb Add return type for cmd.retcode to docs 2014-12-04 16:10:08 -07:00
Erik Johnson
27c39d4c15 Re-enable log message 2014-12-04 17:07:03 -06:00
Colton Myers
430463d00a Move state_output CLI option to Output mixin 
Now it will be available for salt-call and salt-ssh commands
 2014-12-04 15:57:46 -07:00
rallytime
5f4affe5f8 Compare ints not strings 2014-12-04 15:46:36 -07:00
Colton Myers
01473ea9ff Normalize cleanup and return routines for state wrappers in salt-ssh 2014-12-04 14:23:41 -07:00
Erik Johnson
c04ef0d36f Fix lint error 2014-12-04 14:44:21 -06:00
Erik Johnson
00ed07411a Merge pull request #18741 from terminalmage/revert-pr18264 
Revert #18254
 2014-12-04 14:37:03 -06:00
Erik Johnson
8c7d66d6dc Revert "Historically the recator has just called the "async" method of the runner and wheel clients, but this actually creates daemonized processes. In addition to creating a new daemonized process each event, the number of process it creates is unbounded, meaning that the reactor can easily use all available PIDs on a fairly busy master. In addition, there is no bound on the CPU that these are allowed to use (since they can create ALL the pids). This changes the reactor to create a threadpool for executing its master-side clients (runner/wheel). This threadpool has a configurable number of workers (max parallelism) and hwm (max queue size before dropping events)." 
This reverts commit 2a8d2a462a.

Conflicts:
	salt/utils/event.py
 2014-12-04 14:31:35 -06:00
Erik Johnson
ba7f08d047 Revert "Remove "fire_event" from AsyncClientMixin, since this was only added to remove infinite recusion in the reactor-- which is now not calling this API" 
This reverts commit 0b19ec7385.
 2014-12-04 14:30:05 -06:00
Erik Johnson
82b5567c92 Revert "Remove some un-used variables" 
This reverts commit 22ed10108e.
 2014-12-04 14:29:56 -06:00
Erik Johnson
32d01ee6c6 Revert "Pylint cleanup for threadpool" 
This reverts commit c93ca9aec2.
 2014-12-04 14:29:44 -06:00
Mike Place
20c39ff4b2 Job to clean pub auth 
Closes #18736
 2014-12-04 13:24:02 -07:00
Mike Place
6bf6ea04c7 Merge pull request #18733 from cachedout/fix_iam_for_requests 
Account for variability in requests module in IAM
 2014-12-04 11:19:43 -07:00
Mike Place
31b9ec3331 Account for variability in requests module 2014-12-04 11:18:19 -07:00
Thomas S Hatch
d3f82b2ab4 Merge pull request #18728 from rallytime/remove_space 
Remove space between salt.utils.process. and ThreadPool
 2014-12-04 10:53:19 -07:00
rallytime
5d2bea1fba Don't comment out second line! 2014-12-04 10:14:25 -07:00
rallytime
39b95a369d Remove space between salt.utils.process. and ThreadPool 
Fixes #18707
 2014-12-04 10:12:17 -07:00
Thomas S Hatch
bf9e72f870 Merge pull request #18679 from SmithSamuelM/2014.7_murat2 
Fix ValueError message in RAET Transport
 2014-12-03 21:13:03 -07:00
Thomas S Hatch
8a7134e72d Merge pull request #18672 from whiteinge/mod_aggregate-state-level 
Add docs for mod_aggregate state-level keywords
 2014-12-03 21:12:10 -07:00
Thomas S Hatch
64bab7c7fd Merge pull request #18666 from garethgreenaway/18550_2014_7_swap_device_symlink 
Fixed to mount state related to enabling swap
 2014-12-03 21:08:11 -07:00
Thomas S Hatch
f17b456e7d Merge pull request #18663 from terminalmage/buildpackage-jenkins-adjustment 
Always run download_packages() after executing buildpackage SLS
 2014-12-03 21:06:54 -07:00
Thomas S Hatch
85c6395eca Merge pull request #18660 from garethgreenaway/18613_2014_7_mount_via_uuid 
Fixes to mount state.
 2014-12-03 21:04:53 -07:00
Thomas S Hatch
09e914813c Merge pull request #18657 from wuxxin/2014.7 
2014.7: fix for #18632
 2014-12-03 21:03:41 -07:00
Thomas S Hatch
b798f33c78 Merge pull request #18655 from eliasp/2014.7-modules.locale-gentoo_fixes 
2014.7 modules.locale gentoo fixes
 2014-12-03 21:02:02 -07:00
Thomas S Hatch
23259e5ecd Merge pull request #18654 from thatch45/func_fail 
Add retcode and success to function not found
 2014-12-03 20:57:41 -07:00