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
72,782 Commits 24 Branches 182 Tags 341 MiB
b282d877e6
Commit Graph

72782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
b282d877e6 Merge pull request #35482 from raazvvann/dev/rheghedu/system-comments 
Add linux support for {get,set}_computer_desc CONTINUED
 2016-08-20 11:44:25 +09:00
Mike Place
e7405258d4 Merge pull request #35499 from cro/returner_self_destruct 
Returner self destruct
 2016-08-20 11:42:03 +09:00
Mike Place
41cda642d6 Merge pull request #35518 from cachedout/fix_parallels 
Fix Parallels module and associated tests
 2016-08-20 11:38:44 +09:00
Mike Place
f79976532d Remove debugging 2016-08-20 11:38:15 +09:00
Mike Place
2876e67ac4 Merge pull request #35530 from rallytime/remove_add_proxymodule_to_opts 
Remove add_proxymodule_to_opts from minion.py in Carbon
 2016-08-20 11:33:40 +09:00
Mike Place
05ea6b7083 Merge pull request #35532 from rallytime/remove_parse_args_and_kwargs 
Remove the parse_args_and_kwargs function from minion.py
 2016-08-20 11:32:31 +09:00
Mike Place
01f6489373 Merge pull request #35536 from rallytime/ssh_wrapper_state_deprecations 
Remove env references in salt-ssh state wrapper
 2016-08-20 11:27:25 +09:00
Mike Place
37075ca229 Merge pull request #35557 from 10ne1/dev/ionel/fix-integration-test-tmpdir-cleanup 
tests/integration: wait for test children to terminate
 2016-08-20 10:57:22 +09:00
Mike Place
125f7a2c94 Merge pull request #35560 from cachedout/protect_iter_in_state 
Use list for iter in keys iteration in state compiler for py3
 2016-08-20 10:54:07 +09:00
Mike Place
61903666dd Merge pull request #35576 from shitler25oki/develop 
Updated user.py to redact password when test=true
 2016-08-20 10:52:34 +09:00
Mike Place
04610d0e5b Merge pull request #35596 from fillarios/develop 
Add 'os_family' grain mapping for FedBerry
 2016-08-20 10:51:32 +09:00
Mike Place
2df7f56841 Merge pull request #35607 from jmacfar/cpgeturl_makedirs 
Pass makedirs from cp.get_url through to fileclient
 2016-08-20 10:43:32 +09:00
jmacfar
bd70a12ec6 Pass makedirs through to fileclient 
Integration tests for get_url makedirs=True
 2016-08-19 12:18:05 -05:00
Atis Fillarios
d260de96c1 Add 'os_family' grain mapping for FedBerry 2016-08-19 16:22:21 +03:00
Mike Place
05636ec25e Merge pull request #35478 from dincamihai/fix-salt-returns-invalid-json 
Run self.close only if GC did not delete the class before the instance
 2016-08-19 18:21:33 +09:00
Joseph Hall
9dcf24e4e2 Allow extra opts to be passed when creating nodes (#35541) 
* Allow extra opts to be passed when creating nodes

* Allow cloud states to pass in opts
 2016-08-18 17:02:59 -06:00
Nicole Thomas
e0e24aab60 Merge pull request #35578 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-18 16:59:45 -06:00
rallytime
b2a89dbe9b Update other syspaths.SOCK_DIR references with __opts__['sock_dir'] in develop 2016-08-18 15:17:28 -06:00
rallytime
7b3fc41868 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/cloud/clouds/lxc.py
  - salt/cloud/clouds/nova.py
  - salt/cloud/clouds/vmware.py
  - salt/cloud/clouds/vsphere.py
  - salt/cloud/libcloudfuncs.py
  - salt/minion.py
  - salt/modules/yumpkg.py
  - salt/utils/cloud.py
 2016-08-18 14:37:42 -06:00
Nicole Thomas
f7a18234db Merge pull request #35571 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-18 13:50:03 -06:00
Nicole Thomas
9943224f10 adding the () to make changes work (#35573) 
without this change it won't ever show any changes
 2016-08-18 13:49:27 -06:00
rallytime
2930df924e Update localemod_test systemd.sd_booted mock to use salt.utils.systemd.booted 
This brings these tests inline with the changes made to salt.utils.systemd.booted
in #35510
 2016-08-18 13:31:26 -06:00
Erik Johnson
73b549ed00 Merge pull request #35572 from terminalmage/docs 
Fix poor formatting in pkg state docs
 2016-08-18 13:15:52 -05:00
Erik Johnson
7d7a7de9e6 Fix poor formatting in pkg state docs 2016-08-18 13:14:11 -05:00
rallytime
e61b04a707 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/digital_ocean.py
  - salt/cloud/clouds/ec2.py
  - salt/cloud/clouds/libcloud_aws.py
  - salt/cloud/clouds/opennebula.py
  - salt/cloud/clouds/rackspace.py
  - salt/cloud/clouds/softlayer.py
  - salt/cloud/clouds/softlayer_hw.py
  - salt/cloud/clouds/vmware.py
  - salt/loader.py
  - salt/modules/aptpkg.py
  - salt/modules/ebuild.py
  - salt/modules/pacman.py
  - salt/modules/systemd.py
  - salt/modules/yumpkg.py
  - salt/modules/zypper.py
  - salt/scripts.py
  - salt/utils/cloud.py
 2016-08-18 12:09:51 -06:00
Art Schneider
e27cf0f22e Updated user.py to redact password when test=true 2016-08-18 12:00:09 -06:00
Nicole Thomas
2a5d1a0eee fix-35384, fix the logic caused by wrong indent (#35566) 2016-08-18 11:03:24 -06:00
Hengyang Hu
e4e331544e fix-35384, fix the logic caused by wrong indent (#35545) 2016-08-18 10:15:15 -06:00
C. R. Oldham
2e1f45b272 Remove unnecessary with _get_serv() as cur 2016-08-18 10:05:32 -06:00
Mike Place
38630455ec Don't open files in text files in binary mode in pip test (#35553) 
Python 3 is picky about this sort of thing
 2016-08-18 09:41:19 -06:00
Erik Johnson
feb852f8c0 Clarify config.get docstring (#35492) 
* Clarify config.get docstring

This commit adds clarification that Salt's built-in config options
cannot be overriden by config.get.

* Remind user that pillar_opts must be turned on to traverse master opts

* s/by/be/
 2016-08-18 09:33:49 -06:00
Mike Place
dfe0e3d320 Merge pull request #35475 from terminalmage/fix-winrepo-root 
Fix winrepo root in develop
 2016-08-19 00:01:14 +09:00
Heghedus Razvan
46696794ab Add integration test for {get/set}_computer_desc 
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2016-08-18 17:03:26 +03:00
Collin Richards
22bed77df8 Add linux support for {get,set}_computer_desc 
* Attempt to get/set computer description using hostnamectl
* On systems without hostnamectl manually read/write /etc/machine-info

Signed-off-by: Collin Richards <collin.richards@ni.com>
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
 2016-08-18 17:02:00 +03:00
Mike Place
205d8e2e7b Merge pull request #35483 from gtmanfred/2015.8 
use __utils__ in salt.cloud
 2016-08-18 22:32:22 +09:00
Mike Place
fc37cec82a Use list for iter in keys iteration in state compiler for py3 
Refs the test integration.states.compiler.CompileTest.test_multi_state
 2016-08-18 22:06:19 +09:00
Ioan-Adrian Ratiu
0561aaf139 tests/integration: wait for test children to terminate 
This is a fix for salt github issue #35028.

Commit b02926f41c ("Immediate shutdown") removed the join() call
when stopping the daemon process, thus triggering a race between the
tmpdir cleanup logic and running children who still have data to
write. By re-adding the join() call we ensure all children finish
before the tmpdir gets removed. Children should normally be dead when
the call from join() returns, the SIGKILL logic after join() is for
cleaning up hanged processes.

Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
 2016-08-18 14:43:50 +03:00
Mihai Dinca
7872e18051 Run self.close only if GC did not delete the class before the instance 2016-08-18 10:27:51 +02:00
Mike Place
70fa2d0901 Merge pull request #35546 from whiteinge/salt-api-eauth-fail-gracefully 
Salt api eauth fail gracefully
 2016-08-18 16:21:55 +09:00
Mike Place
f2eb3dc105 Merge pull request #35489 from rallytime/bp-35463 
Back-port #35463 to 2016.3
 2016-08-18 16:16:03 +09:00
Seth House
eb3574adae Don't fail hard if the user's permissions cannot be found 
Salt enforces authorization not salt-api. Showing the user his/her
permissions is a nicety only. We should make a best effort to retrieve
them but if we cannot we should log the user in instead of blocking.
 2016-08-17 18:56:03 -06:00
Mike Place
9279d6b6eb Merge pull request #35496 from StackPointCloud/profitbricks-cloud-improvements 
ProfitBricks cloud provider features and improvements
 2016-08-18 09:39:02 +09:00
Seth House
ec597bd54c Change groups check in token to look for truthy values 
The 'groups' value in the token payload can be missing, can be False,
can be None, or can be an array.
 2016-08-17 18:38:09 -06:00
Ethan Devenport
1ca7cad768 Corrected pylint string issue. 2016-08-17 22:33:07 +00:00
Thomas S Hatch
b65c07c4d3 Add a note to LocalClient docs about IOLoops (#35501) 
* Add a note to LocalClient docs about IOLoops

* Tornado is used as a propper noun
 2016-08-17 16:12:43 -06:00
David Boucha
61fec6caa9 add missing glob import (#35525) 
* add missing glob import

* move glob import so pylint doesn't freak out.

* pylint requires 2 spaces before the comment.

* remove trailing whitespace
 2016-08-17 16:10:00 -06:00
Nicole Thomas
a8b84ca5af Spelling fix in nxos proxy docs (#35527) 2016-08-17 16:09:12 -06:00
Nicole Thomas
6d0e9a0697 Be explicit about SaltInvocationError import (#35528) 2016-08-17 16:08:52 -06:00
Nicole Thomas
b9e7b8ba2d Add versionadded tag for show_low_sls function in salt-ssh state wrapper (#35537) 2016-08-17 16:07:37 -06:00
Thomas S Hatch
5cbd5eb10f since some distros strip xml out of python we should treat it as (#35538) 
an optional dep
 2016-08-17 16:07:01 -06:00