valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,763 Commits 24 Branches 182 Tags 341 MiB
9a94019aad
Commit Graph

67763 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Lutro
9a94019aad deleting tasks can fail as well 2016-03-22 15:30:14 +01:00
Andreas Lutro
46018e4535 update kapacitor tests 2016-03-22 15:10:46 +01:00
Andreas Lutro
c459557992 kapacitor module + state improvements 
- return a dict of data from the module functions
- use that dict data to give better messages when something goes wrong
  in the state functions
 2016-03-22 15:10:13 +01:00
Andreas Lutro
ddc499b57b use http status code to detect "task not found" 2016-03-22 15:10:13 +01:00
Mike Place
5096d33bc3 Merge pull request #31887 from iamseth/develop 
Add next gen win_servermanager execution and state modules for newer Windows minions
 2016-03-21 15:47:52 -06:00
Mike Place
e3ac930c74 Merge pull request #31942 from Oro/saltutil-abort_all_jobs 
Added term_all_jobs and kill_all_jobs to saltutil module
 2016-03-21 15:12:49 -06:00
Mike Place
2f808d8762 Merge pull request #32005 from Ashald/bugfix/netapi-runner-client-kwargs-yamlify 
Bugfix: `RunnerClient` keyword argument values processing
 2016-03-21 15:10:47 -06:00
Mike Place
aead3946ab Merge pull request #31949 from mephi42/develop 
Do not fail service.{running,dead} if $(runlevel) = 'unknown'
 2016-03-21 14:27:08 -06:00
Mike Place
97ef22993f Merge pull request #32024 from rallytime/github-module 
Add new repo, issue, and milestone functions to github module
 2016-03-21 14:15:49 -06:00
Mike Place
d0ca640e60 Merge pull request #31984 from gtmanfred/contents 
allow contents_* to be lists
 2016-03-21 11:56:29 -06:00
rallytime
22a98a3cc6 Add milestone functions to aid in getting milestone number 2016-03-21 11:25:11 -06:00
Nicole Thomas
44fd52d60d Merge pull request #32018 from DSRCompany/features/minionswarm_base_config 
Handle -c option in minionswarm script.
 2016-03-21 09:27:54 -06:00
Nicole Thomas
9045c15ba1 Merge pull request #31995 from grichmond-salt/aws_improvements 
Add support for ap-northeast-2 and us-gov-west-1 regions in AWS
 2016-03-21 09:12:47 -06:00
Nicole Thomas
836fbe3e4b Merge pull request #32012 from jfray/duplicate_documentation_for_win_deploy_timeouts 
There were two identical blocks concerning Windows Deploy Timeouts. This
 2016-03-21 09:05:43 -06:00
Dmitry Kuzmenko
88e8106b00 Handle -c option in minionswarm script. 
There is a '-c' option that says: pass in an alt. conf. dir.
But this option isn't used in the minionswarm. I found it very useful to
use it to specify a path to the base salt configuration that would be
updated with the minionswarm specific needs (different ports, paths
etc.) keeping other parameters like alive intervals, timeouts, mine
options and so on.
 2016-03-21 16:13:43 +03:00
Josh Fraser
718d6bde11 There were two identical blocks concerning Windows Deploy Timeouts. This 
pull request removes the extra block of text.
 2016-03-20 21:55:29 -07:00
Borys Pierov
1386906f02 Ensure kwargs properly parsed in RunnerClient 
Apply salt.utils.args.parse_input to kwargs in low data within
RunnerClient._reformat_low before calling
salt.minion.load_args_and_kwargs according to its requirements

The salt.utils.args.parse_input is responsible for 'yamlifying' input
arguments hence missing call leads to un-parsed argument values
 2016-03-19 20:13:26 -04:00
Borys Pierov
c72339f487 Yamlify kwargs values in utils.args.parse_input 
Regression since 18-03-2014: 09de057f71
 2016-03-19 20:13:17 -04:00
Nicole Thomas
f267b7b6ac Merge pull request #31998 from jacobhammons/mock-imports 
Fixed build errors, additional mock imports, new module docs
 2016-03-19 09:48:06 -06:00
Jacob Hammons
e48b84c98f Fixed build errors, additional mock imports, new module docs 
Fixes #31975
 2016-03-18 17:37:22 -06:00
rallytime
54ee9d8a6e Add new repo and issue functions to github module 2016-03-18 17:10:09 -06:00
rallytime
0ed4ff3bfa Refactor various helper functions into single _get_config_value function 2016-03-18 17:10:01 -06:00
Nicole Thomas
011c4d58cc Merge pull request #31996 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-03-18 17:06:37 -06:00
rallytime
37dee42061 Pylint fixes 2016-03-18 16:27:06 -06:00
Gary Richmond
b318cc6495 Alphabetized region list; corrected curly quote 2016-03-18 16:12:02 -06:00
rallytime
52111eb01a Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/minion.py
 2016-03-18 16:00:35 -06:00
Gary Richmond
87d6eed7e7 Add support for ap-northeast-2 and us-gov-west-1 regions in AWS 2016-03-18 15:49:32 -06:00
Nicole Thomas
e150ee9570 Merge pull request #31988 from cachedout/issue_31850 
Adjust docs for saltutil.runner
 2016-03-18 15:49:14 -06:00
Nicole Thomas
5d4ae071e6 Merge pull request #31985 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-03-18 15:24:51 -06:00
rallytime
8a10b258c9 Make sure logging is correct in daemons.py for unit tests 2016-03-18 14:39:19 -06:00
Mike Place
fe86a3d209 Merge pull request #31943 from alprs/fix-salt_ssh_traceback 
Salt-SSH: Prevent stacktrace from being written to the console
 2016-03-18 14:31:49 -06:00
Mike Place
5e14844eef Merge pull request #31945 from alprs/fix-file_managed_diff 
Fix diff never showing with file.managed state
 2016-03-18 14:31:29 -06:00
Mike Place
0ce0ca9d15 Merge pull request #31962 from DSRCompany/features/intuit_failover_failback 
Features/intuit failover failback
 2016-03-18 14:30:55 -06:00
Mike Place
b216856783 Merge pull request #31990 from skizunov/develop2 
Fix race condition with self.connected on TCP transport
 2016-03-18 14:29:16 -06:00
Nicole Thomas
81583bb80c Merge pull request #31987 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-03-18 14:27:18 -06:00
rallytime
4768bfafc6 Disable boto tests that are failing on develop 2016-03-18 14:02:06 -06:00
Sergey Kizunov
fb968f58d6 Fix race condition with self.connected on TCP transport 
There is a race condition that occasionally happens when using
the TCP transport. When using the TCP transport, it will fire the
`__master_connected` event before returning from tcp.py's
`AsyncTCPPubChannel.connect_callback`. What sometimes happens is
that the event handler for `__master_connected` is executed before
the control is returned to `eval_master` in master.py. If this
happens, `self.connected` is not yet defined, since `eval_master`
defines it. The event handler for `__master_connected` tries to
access the not yet defined `self.connected` and an exception occurs.

One possible solution is to use `hasattr` to check if `self.connected`
is defined before accessing it in the `__master_connected` handler.
However, I think it is cleaner just to set `self.connected = False` in
`Minion.__init__`, that way this variable will be defined in all cases
and can be relied upon.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-03-18 14:43:17 -05:00
rallytime
a110b4d55d Don't overwrite previously mocked grains 2016-03-18 13:29:08 -06:00
rallytime
1f9579f6e7 Pylint 2016-03-18 13:11:01 -06:00
rallytime
b2f3cc080f Disable more boto test classes that kill the test suite 2016-03-18 13:04:34 -06:00
Dmitry Kuzmenko
52ba528c72 Updated status.ping_master docstring 2016-03-18 21:48:26 +03:00
Dmitry Kuzmenko
942b71b8b8 Failback to the topmost master in multimaster failover mode. 
2 Options added:
master_failback: bool
master_failback_interval: int

With master_failback set to False works as before.
 2016-03-18 21:48:26 +03:00
Dmitry Kuzmenko
e6fdfae4a4 Publish status.master outside the scheduler process. 
This is done to avoid Scheduled processes hanging on timeout wait. This
breaks failover after the second master failed.
 2016-03-18 21:48:26 +03:00
rallytime
fa4650523e Pylint fixes 2016-03-18 12:21:09 -06:00
Mike Place
e51ddfa2a3 Adjust docs for saltutil.runner 
Closes #31850
 2016-03-18 12:14:56 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
 2016-03-18 11:26:12 -06:00
rallytime
308aa5fd61 Merge branch '2016.3' into 'develop' 
Conflicts:
  - conf/master
  - conf/minion
  - doc/ref/proxy/all/index.rst
  - salt/cli/daemons.py
  - salt/modules/key.py
  - salt/modules/reg.py
  - salt/modules/win_pkg.py
  - salt/utils/__init__.py
  - salt/utils/cloud.py
  - tests/unit/daemons_test.py
 2016-03-18 10:57:15 -06:00
Daniel Wallace
86bf75a883 allow contents_* to be lists 
Allow for contents_pillar and contents_grains to be lists that are
concatinated together.

Specifically for stuff like nginx ssl certificates.
 2016-03-18 10:46:14 -06:00
Mike Place
811c212c2d Merge pull request #31950 from kraney/boto_apigateway 
Boto apigateway
 2016-03-18 10:38:25 -06:00
Mike Place
ad8ada7eef Merge pull request #31981 from lloydoliver/linux-disk-grain-fix 
include rotational disks in grains under linux
 2016-03-18 09:54:00 -06:00