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
73,494 Commits 24 Branches 182 Tags 341 MiB
1c83b37fe6
Commit Graph

73494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
a86e36cd31 Add docs for new kwargs added to the wheel key module (#36040) 
* Add docs for new kwargs added to the wheel key module

Refs #36030

* Fix copy-paste error: use the correct kwarg name/description
 2016-09-06 10:19:24 -06:00
Seth House
2934fc1a57 Doc cherrypy deemphasize urlencoded (#36047) 
* Reword and clarify usage, clients & arg/kwarg, and content negotiation

* Replace all urlencoded examples with JSON examples

Using urlencoded format is a fast shorthand at the CLI with curl but it
should really be avoided for any real work. It requires having to know a
lot about the limitations and use of the format, and for complex tasks
it requires knowing a lot about how Salt's CLI `name=val` string parsing
works. It causes a lot of confusion and support issues and it should be
the exception, not the rule.

* Add one more mention of the full list of client interfaces
 2016-09-06 10:18:52 -06:00
Mike Place
8656c0d34b Merge pull request #35992 from terminalmage/carbon-tests 
Tests for new Carbon features
 2016-09-07 01:01:09 +09:00
rallytime
f1f1b84611 Make sure all sample config files in cloud.profiles.d are commented out 2016-09-05 19:20:33 -06:00
rallytime
832af68bad Make sure all sample config files in cloud.maps.d are commented out 2016-09-05 19:12:27 -06:00
rallytime
dd53a26af5 Add unit tests for sample files in cloud.profiles.d, cloud.providers.d, 
and cloud.maps.d
 2016-09-05 19:11:19 -06:00
rallytime
14907e15d3 Make sure cont/cloud.profiles file is commented out 
Matches the cloud.providers file format and other sample config files.
 2016-09-05 18:13:02 -06:00
rallytime
b04cc62927 Add unit tests to check for all files in conf/ to be commented out 2016-09-05 18:08:02 -06:00
rallytime
9828a0dbfa Comment all lines in the minion config file 2016-09-05 17:30:59 -06:00
Erik Johnson
9ae753f6ed Use self.run_run instead of self.run_run_plus 
Using a salt.runner.Runner() instance to run this test has exposed a
problem with run_run_plus, where the fileclient doesn't behave as
expected. Since the raw return data is not needed, using run_run here
lets the test pass while we continue to work on run_run_plus.
 2016-09-03 14:59:04 -05:00
Erik Johnson
e36d6839d1 Two fixes in _get_envs() 
1. Don't get client_envs twice.
2. Don't add 'base' more than once.
 2016-09-03 14:59:04 -05:00
Erik Johnson
ab9a89d6dc Add test for jid in runner ret events (zh 858) 2016-09-03 14:59:04 -05:00
Erik Johnson
3345da0d36 Add tests for gitfs per-saltenv configuration (#29954) 2016-09-03 14:59:04 -05:00
Erik Johnson
c35ed45668 Rename test file so that it runs properly when unit tests are executed 2016-09-03 14:59:04 -05:00
Erik Johnson
92d6d4ab75 Fix incorrect key for return data 
The return data from run_run_plus previously returned the runner return
in the ``fun`` key. This has since been corrected. This commit replaces
these references to the ``fun`` key with the corrected ``return`` key.
 2016-09-03 14:59:04 -05:00
Erik Johnson
5673395f0c Update usage of run_run_plus to remove unused "options" argument 2016-09-03 14:59:04 -05:00
Erik Johnson
d4059a0d79 Update the run_run_plus docstring 2016-09-03 14:59:04 -05:00
Erik Johnson
a3442a88ed Update docs on run_run_plus 2016-09-03 14:59:04 -05:00
Erik Johnson
74d5f3aa51 Remove unused argument 2016-09-03 14:59:04 -05:00
Erik Johnson
a4e96cfb7a Don't execute the runner twice in run_run_plus 
Instead, compile output by executing salt.output.display_output() on the
return data obtained from executing the runner via the Python API.
 2016-09-03 14:59:04 -05:00
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
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
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
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
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