valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
60,742 Commits 24 Branches 182 Tags 341 MiB
a74dbad74a
Commit Graph

60742 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
justinta89
a74dbad74a Started fixing win_firewall_test 2015-10-22 13:12:31 -06:00
Mike Place
d85c13e2eb Merge pull request #28195 from plastikos/feature-failed_minions_summary 
Add failed minion information to summary (--summary argument) information:
 2015-10-22 08:42:14 -06:00
Mike Place
c88406948d Merge pull request #28189 from plastikos/improvement-default_opts 
Always get default option settings from salt.config
 2015-10-22 08:11:26 -06:00
Mike Place
45e75b21da Merge pull request #28186 from plastikos/bug-philips_hue 
philips_hue fails during unit tests.
 2015-10-22 08:08:14 -06:00
Mike Place
6e412b2142 Merge pull request #28188 from cachedout/issue_15741 
Minor optimization for cloud cache
 2015-10-22 08:07:06 -06:00
Thayne Harbaugh
625a129445 Additional corrections to use option defaults directly from salt.config 
* correct 'id' entry in salt.config
  * add 'event_match_type' in salt.config
  * ensure that hash is only calculated in minion since it isn't needed by the master
 2015-10-21 22:15:13 -06:00
Thayne Harbaugh
3dfc734fca Add failed minion information to summary (--summary argument) information: 
* Add count of "# of minions with errors"
  * Add specific failed minion IDs when --verbose is used
 2015-10-21 20:32:39 -06:00
Thayne Harbaugh
9c08ecfb56 Always get default option settings from salt.config 
It is a poor practice to duplicate settings and scatter them through multiple
files.  Configuration options have been centralize in salt.config, yet
salt.utils.event repeats many of those settings for the benefit of unit tests
that pass only partial "opts" parameters.  Rather than change all of the unit
tests (and other callers) to provide sufficient settings in the "opts"
parameters, the various classes that need opts should start with the default
options provided by salt.config as a base and then the passed-in "opts"
parameter to __init__() functions should override the base options.

  * Use the appropriate salt.config.DEFAULT_MASTER_OPTS or
    salt.config.DEFAULT_MINION_OPTS.

  * Remove all of the spurrious, redundant default settings from
    salt.utils.event.

  * Drop use of "opts.get(KEY)" in favor of "opts[KEY]" - KeyError exceptions
    are a good thing because they indicate that an appropriate default is not
    in salt.config.

TODO: Perform similar clean-ups through other files in the code base.
 2015-10-21 17:37:41 -06:00
Colton Myers
b3f3275e0a Merge pull request #28163 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-10-21 16:46:40 -06:00
Colton Myers
c42cb01352 remove pylint disables, as it's broken in develop anyway 
(plus the pylint disables didn't work)
 2015-10-21 16:39:28 -06:00
Colton Myers
c89d63650e Quiet pylint 2015-10-21 15:10:52 -06:00
Thayne Harbaugh
da74c0bace philips_hue fails during unit tests. 
It appears that it cannot index 'proxymodule' and doesn't properly handle the
exception.  This may not be the best way, but it will properly skip
initialization if settings are unavailable.
 2015-10-21 15:03:50 -06:00
Mike Place
4842664449 Merge pull request #28164 from lorengordon/cmd-script-context 
Add `defaults` and `context` parameters to cmd.script state
 2015-10-21 07:23:21 -06:00
Mike Place
b5550fcf76 Merge pull request #28159 from plastikos/improvement-check_cmd_docs 
Improve documentation of `check_cmd`.
 2015-10-21 07:21:13 -06:00
Mike Place
508e63237b Merge pull request #28090 from Pixcell/develop 
Add clone for qemu
 2015-10-21 07:19:16 -06:00
Mike Place
7d31adf9b8 Merge pull request #28035 from DSRCompany/issues/do_not_deep_copy_just_to_iterate_keys 
Don't deepcopy just to iterate over dict keys/list items.
 2015-10-21 07:17:36 -06:00
Loren Gordon
0354128484 Add type-checking for defaults and context in cmd.script 2015-10-21 06:02:41 -04:00
root
73b8e85a96 Update doc 2015-10-21 05:45:28 -04:00
Loren Gordon
e3a5758679 Add defaults and context parameters to cmd.script state 
Fixes #9153
 2015-10-20 20:33:17 -04:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Colton Myers
053ad408c7 Merge pull request #28155 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-10-20 17:48:41 -06:00
Colton Myers
c4c889f97b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    salt/daemons/masterapi.py
    salt/minion.py
 2015-10-20 14:47:49 -06:00
Nicole Thomas
53dd01fc24 Merge pull request #28149 from pass-by-value/proxmox_profile_doc_change 
Add clarification to cloud profile doc about host
 2015-10-20 13:46:05 -06:00
Thayne Harbaugh
7f8d5a56d1 Improve documentation of check_cmd. 
* Make the distinction between requisite `check_cmd` and `file.managed`
  `check_cmd`.

* Be more clear about `file.managed` `check_cmd`, the temporary file,
  and when the new contents are written or discarded.

* In requisite `check_cmd` use a concise `!` rather than the awkward
  `&& exit 1 || exit 0`.

* A few minor, stylistic changes.
 2015-10-20 13:44:06 -06:00
Aditya Kulkarni
bc371c55cd Add clarification to cloud profile doc about host 2015-10-20 15:17:47 -04:00
Mike Place
7badd634ae Merge pull request #28146 from cachedout/lint_dracr 
Lint dracr.py
 2015-10-20 11:55:07 -06:00
Mike Place
8b057f39e8 Lint dracr.py 2015-10-20 11:54:29 -06:00
Mike Place
9509d8838b Merge pull request #26918 from cachedout/issue_25124 
Revoke auth immediately on minion key deletion
 2015-10-20 11:39:40 -06:00
Mike Place
ca57e2199a Merge pull request #28129 from s0undt3ch/develop 
Changes required for creating a py.test salt plugin
 2015-10-20 11:33:44 -06:00
Mike Place
5f99bd4dc6 Merge pull request #28141 from rallytime/fix-28118 
Don't use RAM for root disk size in linode.py
 2015-10-20 11:32:29 -06:00
Mike Place
7cd0440c33 Merge pull request #28143 from jtand/lint_fix 
Removed blank line at end of chassis.py
 2015-10-20 10:39:35 -06:00
justinta89
427df95515 removed extraneous file 2015-10-20 10:38:41 -06:00
Mike Place
780b27e360 Don't rotate key if option to not rotate is set 2015-10-20 10:38:22 -06:00
Mike Place
248cf6b4e2 Don't revoke auth if no aes key rotate 2015-10-20 10:38:22 -06:00
Mike Place
4ee13b3f18 Revoke auth immediately on minion key deletion 
Fixes #25124
 2015-10-20 10:38:21 -06:00
Mike Place
15a07e11b5 Merge pull request #28089 from The-Loeki/sysfs-module 
Contribution: SysFS module
 2015-10-20 10:34:40 -06:00
Mike Place
0939c451ec Merge pull request #28063 from SmithSamuelM/sam_20151017 
Fixes broken Salt Raet. master.flo file path broken
 2015-10-20 10:33:07 -06:00
Mike Place
ab18dcf637 Merge pull request #28140 from rallytime/bsd-installation-doc 
Add OpenBSD installation documentation to 2015.5 branch
 2015-10-20 10:31:34 -06:00
justinta89
1a58283f23 Removed blank line at end of chassis.py 2015-10-20 10:31:31 -06:00
Mike Place
2f05f0e967 Merge pull request #28113 from skizunov/develop2 
'RuntimeError: IOLoop is closing' thrown in Minion on TCP transport
 2015-10-20 10:30:04 -06:00
Mike Place
fad38eb3c3 Merge pull request #28138 from rallytime/bp-28130-sizes-only 
Back-port #28130 EC2 Sizes Only portion to 2015.5
 2015-10-20 10:29:09 -06:00
Mike Place
858875e9fd Merge pull request #28021 from blueyed/recursive-include 
Handle includes in `include_config` recursively
 2015-10-20 10:19:37 -06:00
Mike Place
4dbaec6b0c Merge pull request #28095 from rallytime/bp-28001 
Back-port #28001 to 2015.8
 2015-10-20 10:18:11 -06:00
Mike Place
3dc2cbb21e Merge pull request #28026 from ryancurrah/chocolatey-allow-passing-package_args 
Update chocolatey.py allow passing package_args
 2015-10-20 10:17:15 -06:00
Mike Place
572487073c Merge pull request #28096 from rallytime/bp-28061 
Back-port #28061 to 2015.8
 2015-10-20 10:15:34 -06:00
Mike Place
9ce526260b Merge pull request #28139 from rallytime/bp-28103 
Back-port #28103 to 2015.8
 2015-10-20 10:15:05 -06:00
Pedro Algarvio
0ac0e4378a Py3 compat 2015-10-20 17:12:18 +01:00
Pedro Algarvio
96021565a9 Don't use the deprecated imp.get_suffixes() under Py3. 2015-10-20 17:12:17 +01:00
Pedro Algarvio
2d5e06554a Py3 compat 2015-10-20 17:12:17 +01:00
Pedro Algarvio
67277fb438 Remove the TODO, the function should not be removed. 2015-10-20 17:12:17 +01:00