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,079 Commits 24 Branches 182 Tags 341 MiB
131d3a1911
Commit Graph

67079 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
de4678863b Merge pull request #31540 from tsaridas/boto_rds 
add function modify_db_instance
 2016-02-29 09:07:02 -07:00
Mike Place
53da394188 Merge pull request #31524 from kraney/boto_lambda 
boto_lambda robustness fix in the face of restricted policies
 2016-02-29 09:05:25 -07:00
Mike Place
01c9550953 Merge pull request #31527 from Ashald/bugfix/consul-pillar-empty-keys 
Consul Pillar: don't crash on empty values
 2016-02-29 09:04:33 -07:00
Mike Place
b9ca73d437 Merge pull request #31535 from kstreee/saltstack/salt#31534 
[saltstack/salt#31534] Resolve a bug that rest_tornado doesn't response for invalid and dictionary type of request body.
 2016-02-29 09:03:03 -07:00
Mike Place
dec4948711 Merge pull request #31533 from m03/add-list_sessions-to-rdp 
Add session info to rdp module
 2016-02-29 08:35:16 -07:00
Mike Place
95af21325f Merge pull request #31536 from virtrnd/remove-jessie-backports-from-raspbian-install 
Remove debian repo from raspbian installation
 2016-02-29 08:32:52 -07:00
Mike Place
060a60fd90 Merge pull request #31521 from terminalmage/issue24753 
salt-ssh: Fix race condition when caching files to build the thin tarball
 2016-02-29 08:32:22 -07:00
Mike Place
8e8036db3f Merge pull request #31518 from rallytime/testrunner-additions 
Add test runner options that were lost in merge-forward
 2016-02-29 08:31:53 -07:00
Mike Place
5965319600 Merge pull request #31528 from vutny/cloud-bootstrap-doc 
Correct Salt Cloud documentation about updating Salt Bootstrap script
 2016-02-29 08:30:59 -07:00
Mike Place
96c0926298 Merge pull request #31539 from DSRCompany/issues/31365_centos7_osrelease_fix 
Added temporary workaround for CentOS 7 os-release id bug.
 2016-02-29 08:30:34 -07:00
Mike Place
e255467a95 Merge pull request #31537 from DSRCompany/issues/fix_wheel_cmd_inheritance 
Fix WheelClient.cmd() inheritance.
 2016-02-29 08:29:50 -07:00
Mike Place
a0d8a226f1 Merge pull request #31523 from skizunov/develop2 
Fix 'failover' mode when using salt-call
 2016-02-29 08:02:50 -07:00
Mike Place
4c80d51b2b Merge pull request #31532 from LoveIsGrief/develop 
Public documentation for salt-cloud virtualbox
 2016-02-29 08:01:50 -07:00
Dmitry Kuzmenko
a3b806d126 Added temporary workaround for CentOS 7 os-release id bug. 2016-02-29 17:16:23 +03:00
Andrea Redi Tsarida
c9807104c1 add function modify_db_instance 2016-02-29 12:53:59 +01:00
virtualguy
e48900ac55 Use python-tornado from jessie-backports for pure debian 2016-02-29 22:42:15 +13:00
kstreee
91b5dc7048 [saltstack/salt#31534] Resolve a bug that rest_tornado doesn't response for 1. invalid request, 2. dictionary type of request, and add test cases for it. 
Typo in __init__.py
 2016-02-29 17:59:16 +09:00
Erik Johnson
0d352bbc16 Add fileclient tests 2016-02-29 01:05:33 -06:00
Dmitry Kuzmenko
ef42a58f70 Fix WheelClient.cmd() inheritance. 
The method is overriden just to update the PyDoc string. So it should
call parent method.
 2016-02-29 10:00:44 +03:00
virtualguy
6e338e2601 Remove debian repo from raspbian installation 
Binary packages from stock debain repo (http://httpredir.debian.org/debian) are not armv6 compatible so should not be installed on raspberry pi version 1. Rasbian doesn't have jessie-backports so safer just to install python-tornado from stretch.
 2016-02-29 19:20:51 +13:00
Morrie Winnett
036c73fb9e Add session info to rdp module 2016-02-28 13:42:44 -08:00
LoveIsGrief
0eba4cdf17 Public documentation for salt-cloud virtualbox 2016-02-28 17:29:02 +01:00
Eric Cook
17f7a2d90c nspawn.py: Fix bad keyword assignment 
Currently every keyword for _pull_image is considered a bad keyword.

```
% salt node nspawn.pull_tar url bar
ERROR executing 'nspawn.pull_tar': The following invalid keyword arguments were passed: verify=False.
```
 2016-02-28 00:32:52 -05:00
Denys Havrysh
f7beeb69f2 Correct Salt Cloud documentation about updating Salt Bootstrap script 2016-02-27 22:43:07 +02:00
Borys Pierov
b451f9be22 Consul Pillar: don't crash on empty values 2016-02-27 12:45:19 -05:00
Dmitry Kuzmenko
a50b33d96a Don't fork in try with critical finally logic. 
Fork executes finally section triple times.
 2016-02-27 11:21:11 +03:00
Sergey Kizunov
877bc25381 Fix minion failover after disconnect 
salt/minion.py:
- In the `__master_disconnected` case, it originally set
`self.opts['master']` to the result of `self.eval_master`. This
makes no sense since `self.eval_master` returns a future. Now we
yield on `self.eval_master` and store both return values.
- Just like in `Minion.destroy`, we clear `self.pub_channel.on_recv`.
Also, if `self.pub_channel` has a `close`, it is invoked. This
resolves a circular reference issue with the TCP transport. The
`SaltMessageClient` contains function references to the
`connect_callback` and `disconnect_callback` functions in
`AsyncTCPPubChannel`. This circular reference prevents the `del` from
deallocating the `AsyncTCPPubChannel` object.

salt/transport/tcp.py:
- In `SaltMessageClient.close`, reset the function references
`self.connect_callback` and `self.disconnect_callback`. This allows a
subsequent `del` on `AsyncTCPPubChannel` to actually deallocate the
object.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-02-27 11:08:34 +03:00
Kris Raney
ea4e5b76a0 boo_lambda robustness fix in the face of restricted policies 2016-02-26 17:53:10 -06:00
Nicole Thomas
9edd79d811 Merge pull request #31519 from jfindlay/launch_virtual 
launchctl, mac_assistive __virtual__: more LooseVersion, use osrelease
 2016-02-26 16:40:59 -07:00
Sergey Kizunov
2cc0231584 Fix 'failover' mode when using salt-call 
'failover' mode, among other things, was intended to be handled in
`SMinion.__init__`. Unfortunately, the original code simply had:

`self.eval_master(self.opts, failed=True)`

This will do nothing, since `self.eval_master` will return a future
and nothing actually runs that future (it isn't added to any IO loop,
just discarded). Now we synchronously invoke that future to make sure
that this logic is executed before code flow continues.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-02-26 16:43:21 -06:00
Erik Johnson
d9370a8041 Update cp module salt-ssh wrapper to use new cachedir param 2016-02-26 16:07:47 -06:00
Erik Johnson
0320494b1d Update the SSH state module wrappers to pass an alternate cachedir 2016-02-26 16:07:47 -06:00
Erik Johnson
65bdcb3afa Accept and pass through the alternate cachedir when prepping the thin tar 2016-02-26 16:07:47 -06:00
Erik Johnson
c3f7a2f2e5 Add ability to specify an alternate base dir for file caching 
This commit extends the fileclient such that it is possible to override
the base directory for file caching. The new "cachedir" param can be
either a relative path or an absolute path. If it is relative, the path
will be appended to __opts__['cachedir'], and if it is absolute then it
will take the place of __opts__['cachedir'].
 2016-02-26 16:07:47 -06:00
Justin Findlay
afb96e9dcb states.mac_assistive.__virtual__: use osrelease 2016-02-26 13:51:36 -07:00
Justin Findlay
22f6e5daab modules.mac_assistive.__virtual__: use osrelease 2016-02-26 13:50:50 -07:00
Justin Findlay
e5e4995644 modules.launchctl.__virtual__: more LooseVersion 2016-02-26 13:47:35 -07:00
rallytime
6a1a2f1316 Remove grains from TEST_SUITES dictionary - this dir doesn't exist 2016-02-26 13:29:44 -07:00
Nicole Thomas
554eb2df7a Merge pull request #31478 from s-schweer/develop 
Salt-Cloud Provider nova floating ip handling:
 2016-02-26 11:43:05 -07:00
rallytime
fe35a88e28 Add test runner options that were lost in merge-forward 2016-02-26 11:38:21 -07:00
Kris Raney
279ab9d468 Fix merge error 2016-02-26 11:49:36 -06:00
Mike Place
45d840845d Merge pull request #31514 from rallytime/bp-31279 
Back-port #31279 to 2016.3
 2016-02-26 10:24:22 -07:00
Mike Place
c044fd79ac Merge pull request #31198 from FirefighterBlu3/py3-raet-startup 
[Py3 w/raet startup only] change salt/master.py:510 to work in both py2 & py3
 2016-02-26 10:21:41 -07:00
Mike Place
3d8fb3d15c Merge pull request #31512 from DSRCompany/issues/29567_do_not_fork_in_try 
Don't fork in try with critical finally logic.
 2016-02-26 09:50:44 -07:00
Daniel Wallace
f2040f88ef add pillars to extmods sync_all commands 
So that we can use _pillar from the fileserver
 2016-02-26 09:35:53 -07:00
Kris Raney
0aa6334442 Merge branch 'develop' into kraney_bugfix 
Conflicts:
	salt/pillar/__init__.py
 2016-02-26 09:41:09 -06:00
Mike Place
a0986739a7 Merge pull request #31505 from anonymouzz/develop 
slack module: add slack incoming webhook support.
 2016-02-26 08:29:10 -07:00
Mike Place
95db870325 Merge pull request #31508 from mcalmer/zypper-correct-exit-code-checking 
Zypper correct exit code checking
 2016-02-26 08:21:23 -07:00
Mike Place
9d6a4640cb Merge pull request #31511 from s-schweer/file_serializer 
manage file accepts show_changes but was passed show_diff
 2016-02-26 08:20:42 -07:00
Mike Place
e51126179c Merge pull request #31510 from vutny/debian-raspbian-install-guide 
Add installation guide for Raspbian (Debian on Raspberry Pi)
 2016-02-26 08:06:57 -07:00