valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,797 Commits 24 Branches 182 Tags 341 MiB
04753bf67c
Commit Graph

73797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
b3dfd95a6d Support writing output to an open filehandle/file-like object 2016-09-03 14:59:04 -05:00
Erik Johnson
f41db032a2 Add ability to reload client_config to run_run_plus 
This allows one to pass a kwarg to run_run_plus called
``__reload_config`` which will be passed as the ``from_scratch``
argument to self.get_config(). This allows self.run_run_plus() to force
a reload of the master config for integration tests which require the
config to be reloaded, for instance, from master.d/*.conf.
 2016-09-03 14:59:04 -05:00
Erik Johnson
693ea2a066 Remove code adding runner return data to master job cache 
This has been removed in favor of the one already in
salt/client/mixins.py.
 2016-09-03 14:59:04 -05:00
Erik Johnson
09907cadc1 Add code to disable runner_returns via config option 
This also will allow any future classes which happen to use this mixin
to disable storing the job data in the master job cache.
 2016-09-03 14:59:04 -05:00
Erik Johnson
6f8984630d Change default for runner_returns to True 2016-09-03 14:59:04 -05:00
Erik Johnson
230c684d4c Add test case for runner returns 2016-09-03 14:59:04 -05:00
Erik Johnson
c872f12f9c Replace _jid_dir() with salt.utils.jid.jid_dir() 2016-09-03 14:59:03 -05:00
Erik Johnson
c278b1f52c Move function for jid_dir to salt.utils.jid 
This makes it more readily available for integration tests
 2016-09-03 14:59:03 -05:00
Erik Johnson
070e5f3c48 Fix typo, add return and jid to run_run_plus 
Also make kwargs work (they were being ignored)
 2016-09-03 14:59:03 -05:00
Erik Johnson
d53e1ce9a4 Remove usage of double-asterisk for state.orchestrate runner 
This prevents the entire master opts from being part of the event data
for orchestration jobs.
 2016-09-03 14:59:03 -05:00
Erik Johnson
573442fe82 Add orchestration_jid directly to kwargs which will be passed to state.orchestrate 2016-09-03 14:59:03 -05:00
mwinnett
2b92c383f1 Add initial unit tests for win_snmp 2016-09-03 12:34:28 -07:00
Felix Deschamps
a012e3b98b Update sdb.py 2016-09-02 18:35:39 -07:00
Nicole Thomas
74143999d3 Merge pull request #36039 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-02 15:50:47 -06:00
Justin Findlay
430ec201d9 modules.parallels: add exists and state fcns 2016-09-02 15:48:03 -06:00
Justin Findlay
0f7d704eb6 modules.parallels: add clone and delete functions 2016-09-02 15:48:03 -06:00
Justin Findlay
9eb0f637e9 modules.parallels.list_vms: add template arg, update name arg 2016-09-02 15:40:56 -06:00
Justin Findlay
d913f2cbe7 modules.parallels: add prlsrvctl function 2016-09-02 15:40:56 -06:00
Justin Findlay
ab7939cdea modules.parallels: expand module documentation 2016-09-02 15:40:56 -06:00
rallytime
5f499cfd41 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-02 15:00:55 -06:00
Nicole Thomas
1d90c42142 Back-port #35824 to 2016.3 (#36038) 
* Add more documentation to the wheel key module

Fixes #35683

* Shorten some of the pub/priv key documentation examples.
 2016-09-02 14:58:27 -06:00
skizunov
93174eb572 Import "salt.ext.six" instead of "six" (#36036) 
The Windows distribution doesn't come with `six` as a pre-installed
python package. Since `salt.ext.six` already exists, it makes sense
to use that instead of adding `six` to the Windows distribution.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-02 14:57:41 -06:00
Daniel Wallace
65b6734c04 catch unicode encoding errors in json outputter (#36033) 
Add testing too
 2016-09-02 14:56:09 -06:00
Elias Probst
822481ef9e modules.service: Do not default to OpenRC on Gentoo, also allow systemd (#36010) 2016-09-02 14:54:40 -06:00
Thomas S Hatch
1b39c7ed48 Merge pull request #35978 from DSRCorporation/bugs/28462_update_auth_data_on_reauth 
Update auth data on reauth.
 2016-09-02 14:46:55 -06:00
Nicole Thomas
03ebb59e5e Remove commented out skipIf lines in boto_vpc_test module (#36013) 
If we're running these tests successfully now, then let's remove these lines.
 2016-09-02 14:37:41 -06:00
Nicole Thomas
b68d293f86 fix redis_return's clean_old_jobs. (#36014) 
Refs #33969
 2016-09-02 14:37:27 -06:00
Nicole Thomas
95591c2fe6 Add documentation about salt_interface to EC2 docs (#36015) 
Fixes #35618
 2016-09-02 14:37:04 -06:00
Nicole Thomas
b652271ddc Fix type error in networkfbsd osmajorrelease compare (#36016) 2016-09-02 14:36:41 -06:00
Nicole Thomas
bc81818075 Merge pull request #36018 from meaksh/bp-36000-to-2015.8 
Back-port #36000 to 2015.8
 2016-09-02 14:34:55 -06:00
Nicole Thomas
e88df5845d Merge pull request #36019 from meaksh/bp-36000-to-2016.3 
Back-port #36000 to 2016.3
 2016-09-02 14:34:30 -06:00
Thomas S Hatch
b9fc51a172 Fix error when profiling is turned on and minions don't return (#36028) 
* Fix error when profiling is turned on adn minions don't return

* Another try
 2016-09-02 14:30:39 -06:00
Seth House
20a361d1f3 Add include_* kwargs to the *_dict key functions (#36030) 2016-09-02 14:16:00 -06:00
Tom Williams
c4d61cdce8 INFRA-3936 - fix bug in boto_ec2 state when deleting instance (#36034) 2016-09-02 14:14:29 -06:00
Sergey Kizunov
c59ab20a34 Fix Windows salt-master 
The salt-master on Windows was broken by PR #35703 due to the change in
how the ReqServer object was started in a new process. The new way
failed to correctly pickle/unpickle the args/kwargs. To fix this, we
use `__setstate__` and `__getstate__` similar to how other objects in
the same file handle it (such as the `Maintenance` object).

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-09-02 14:43:26 -05:00
Scott Thrasher
06d480012a Switch from comprehension to logic used in jobs runner. This makes it 
easier to deal with potential unicode in returns.
 2016-09-02 10:14:45 -07:00
Felix Deschamps
cfcbdde5f8 Fix for 35681 
Currently a split() is used to retrieve the profile and get the path to pass to the driver (once found). However this truncates the rest of the path. This change uses find() instead of split() to preserve the path
 2016-09-02 10:00:46 -07:00
Nicole Thomas
f76dc0f9c0 Merge pull request #36026 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-09-02 10:40:32 -06:00
rallytime
1bf840b036 Merge branch '2016.3' into 'develop' 
No conflicts.
 2016-09-02 09:43:40 -06:00
Mike Place
cd60ec5d57 Merge pull request #36024 from DSRCorporation/bugs/31454_local_client_memleak 
Don't subscribe to events if not sure it would read them.
 2016-09-03 00:41:01 +09:00
Nicole Thomas
32d5f896d4 Merge pull request #36023 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-02 09:37:59 -06:00
Mircea Ulinic
03007be6b1
Potential fix for #36021 2016-09-02 14:54:17 +00:00
Dmitry Kuzmenko
01911c530e Don't subscribe to events if not sure it would read them. 
Reactor uses LocalClient to send message but do not read events that
produces memory leak in EventPublisher: sent messages are collected
there in the IOStream class.
 2016-09-02 17:20:30 +03:00
rallytime
a63c9dfc6a Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/states/service.py
 2016-09-02 08:19:16 -06:00
Mike Place
e6b93c2380 Merge pull request #36022 from saltstack/revert-33770-service_tests 
Revert "service state integration tests"
 2016-09-02 21:38:36 +09:00
Mike Place
6cf56843d4 Revert "service state integration tests" 2016-09-02 21:38:15 +09:00
rallytime
1b2abeabd1 Lint for #35916 
Merges #35916
 2016-09-02 11:24:13 +01:00
Eric Jackson
8b4f46fbd0 Check for single quote before splitting on single quote 
Signed-off-by: Eric Jackson <ejackson@suse.com>
 2016-09-02 11:24:13 +01:00
rallytime
8c05d2aac5 Lint for #35916 
Merges #35916
 2016-09-02 11:23:06 +01:00
Eric Jackson
b5fe6100ee Check for single quote before splitting on single quote 
Signed-off-by: Eric Jackson <ejackson@suse.com>
 2016-09-02 11:23:03 +01:00