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
72,652 Commits 24 Branches 182 Tags 341 MiB
49179ac401
Commit Graph

72652 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
49179ac401 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/win_pkg.py
  - tests/integration/files/conf/master
 2016-08-16 12:52:20 -06:00
Mike Place
af60f68669 Use BytesIO from six for gzip operations (#35484) 
This should make gzip operations work correctly in py2/py3. Also fixes
failing test for cp module under py3.
 2016-08-16 12:37:21 -06:00
Nicole Thomas
6df4648765 Merge pull request #35487 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-16 12:36:21 -06:00
rallytime
c6c82be1de Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
 2016-08-16 11:02:05 -06:00
Nicole Thomas
bfe7107a87 Update bootstrap script to latest stable (2016.08.16) (#35486) 2016-08-16 10:58:23 -06:00
Thomas S Hatch
240fc12863 Merge pull request #35413 from cachedout/issue_35296 
Resolve path issues with cp.push
 2016-08-16 10:40:39 -06:00
Thomas S Hatch
c3319b2a8b Merge pull request #35476 from cachedout/issue_35380 
Fixup SSH bug where sudo without sudo user would break
 2016-08-16 09:41:25 -06:00
Mike Place
ee525b11b2 Make salt-client aware of edge-case where saltutil might be broken (#35446) 
* Make salt-client aware of edge-case where saltutil might be broken

Closes #34161

* Remove debugging

* Remove debugging pass
 2016-08-16 08:58:43 -06:00
Mike Place
3b6f39eb4e Return cleaner error on pillar/grains rendering failure (#35437) 
* Return cleaner error on pillar/grains rendering failure

Refs #35242

* Lint
 2016-08-16 08:46:51 -06:00
Mike Place
c05fcf33d1 Fixup SSH bug where sudo without sudo user would break 
Fixes #35380
 2016-08-16 12:28:18 +09:00
Mike Place
e3858d8f80 Merge pull request #35400 from thatch45/snapper_states 
Introduce rollback to Salt States
 2016-08-16 12:04:39 +09:00
Mike Place
64a1d326ad Merge pull request #35388 from DSRCompany/features/27446_minion_data_storage 
Pluggable minion data cache
 2016-08-16 12:00:06 +09:00
Mike Place
fb8a12d677 Fix silly error 2016-08-16 11:05:18 +09:00
Mike Place
004778c966 Merge pull request #35471 from terminalmage/issue34479 
win_pkg: Fix traceback when package is not installed
 2016-08-16 11:02:00 +09:00
Mike Place
5c9428c32d Merge pull request #35448 from isbm/isbm-zypper-106-fix 
Add ignore_repo_failure option to suppress zypper's exit code 106 on …
 2016-08-16 10:39:43 +09:00
Mike Place
f90ecbb15e Merge pull request #35449 from dkruger/fix-35422 
aptpkg will specify --install-recommends if enabled by the SLS
 2016-08-16 10:38:56 +09:00
Mike Place
1473474b04 Merge pull request #35451 from isbm/isbm-zypper-mod_repo-unchanged 
Bugfix: zypper mod repo unchanged
 2016-08-16 10:38:25 +09:00
Mike Place
0708b546cb Merge pull request #35452 from dirk-thomas/patch-1 
move routine call out of try/except block
 2016-08-16 10:37:26 +09:00
Mike Place
a8c4f17f50 Merge pull request #35453 from theothergraham/fix_CacheDisk 
fixes #34279 - disk cache ttl expiry
 2016-08-16 10:34:33 +09:00
Mike Place
d8c35b5260 Merge pull request #35459 from thatch45/shim_fix 
Ensure that output for salt-ssh gets back
 2016-08-16 10:29:16 +09:00
Mike Place
6bce9802c1 Merge pull request #35463 from skizunov/develop2 
Make `auth_timeout` user configurable again
 2016-08-16 10:28:25 +09:00
Mike Place
c7564d997a Merge pull request #35464 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-16 10:26:54 +09:00
Mike Place
3a5ae3f3e2 Merge pull request #35465 from jtand/fix_win_firewall_test 
Fix failing win_firewall_tests
 2016-08-16 10:26:11 +09:00
Mike Place
330be069c6 Merge pull request #35468 from thatch45/doc-salt-cp 
Add some more notes to the salt-cp doc
 2016-08-16 10:24:56 +09:00
Mike Place
5e6b185535 Merge pull request #35469 from kraney/boto_elasticache_bugfix 
call to boto_secgroup.convert_to_group_ids should be by keyword args,…
 2016-08-16 10:24:35 +09:00
Mike Place
5bb346f74b Merge pull request #35473 from rallytime/lxc-module-deprecations 
LXC execution module Carbon deprecations
 2016-08-16 10:19:25 +09:00
Mike Place
d2dd78e25b Merge pull request #35467 from rallytime/bp-33518 
Back-port #33518 to 2016.3
 2016-08-16 10:17:01 +09:00
Erik Johnson
e243c63e43 win_pkg: Fix traceback when package is not installed 2016-08-15 19:14:49 -05:00
anthony-shaw
e427815caf fix clrf 2016-08-15 16:30:58 -06:00
rallytime
d17fbe96de LXC execution module Carbon deprecations 2016-08-15 16:28:23 -06:00
Thomas S Hatch
4cc2add938 Add soem more notes to the salt-cp doc 2016-08-15 15:59:41 -06:00
anthony-shaw
be41a400fa commit fix 2016-08-15 15:53:29 -06:00
anthony-shaw
06530b5461 add a test to check existing functionality is broken 2016-08-15 15:53:05 -06:00
Winston Liu
b09ee1826c call to boto_secgroup.convert_to_group_ids should be by keyword args, the earlier code would end up with incorrect parameters being used with region being mapped to vpc_name. 2016-08-15 14:52:15 -07:00
Graham McCullough
ae5b233d51 fixes #34279 2016-08-15 14:34:20 -07:00
Justin Anderson
eb42775a49 Fix orderering in test_add_rule 2016-08-15 14:44:37 -06:00
Justin Anderson
c65347b07d Fix failing win_firewall_tests 2016-08-15 13:45:13 -06:00
rallytime
48cc3bdfaa Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/dockerng.py
  - tests/unit/modules/dockerng_test.py
 2016-08-15 13:27:52 -06:00
Nicole Thomas
2a674fefef [develop] Update bootstrap script to latest stable (2016.08.15) (#35462) 2016-08-15 13:23:44 -06:00
Nicole Thomas
5aeb74de63 [2016.3] Update bootstrap script to latest stable (2016.08.15) (#35461) 2016-08-15 13:23:34 -06:00
Nicole Thomas
38b60a32e5 [2015.8] Update bootstrap script to latest stable (2016.08.15) (#35460) 2016-08-15 13:23:24 -06:00
Sergey Kizunov
998c3db8bf Make auth_timeout user configurable again 
There was code that was overriding the value of `auth_timeout` regardless
of what was set in the configuration. It was overriding it to be 5
seconds. Although 5 seconds is sufficient for most cases, in testing, I
have found it insufficient for the following use case (running both
Windows master and minions):

1) Start salt-master
2) Start salt-minion
3) Stop salt-master
4) Start salt-master

The minion reconnect will timeout after step 4. Due to this, we set the
`auth_timeout` to be 15 seconds in our own configuration file. However,
due to this issue, that configuration value was ignored and thus we
fail on reconnects.

`salt/minion.py`:
- Don't hard-code the `auth_timeout` to 5 seconds. Use the user configured
value (or the default value if the user didn't configure a value).

`salt/config/__init__.py`:
- Made the default be 5 seconds for `auth_timeout` instead of 60. Chose 5
seconds because this is the current hard-coded behavior.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-08-15 14:21:38 -05:00
Nicole Thomas
9b2c075611 Merge pull request #35456 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-15 13:16:22 -06:00
Thomas S Hatch
10037b00cb Some environments refuse to return the command output 
This results in the output from salt-ssh being empty,
this fix ensures that the output is always there
 2016-08-15 12:57:58 -06:00
rallytime
6a86a12294 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/cp.py
 2016-08-15 11:23:44 -06:00
Moe
39e43f30fc Add example yaml to win_snmp state (#35435) 2016-08-15 11:01:57 -06:00
Mike Place
d75005c519 Fix cp.push_dir pushing empty dirs (#35442) 
Fixes #35010
 2016-08-15 11:00:54 -06:00
Nicolas Delaby
49af330492 Docker 1.12 reports tags as null (#35447) 
Add support for this new value.
 2016-08-15 10:58:50 -06:00
Mihai Dincă
a5f982edeb Fix os_family check in zypper module (#35450) 2016-08-15 10:34:11 -06:00
Dirk Thomas
dd502f2e29 move routine call out of try/except block 
The try/except block is indented to handle AttributeErrors if the routine `get_<tgt_type>` is not available. But since the actual function call is also wrapped in the block if the routine is actually implemented but raises an AttributeError that one is catched too (which I think is unintentional).

This patch moves the function call out of the try/except block to not mask AttributeErrors happening within the called routine.
 2016-08-15 09:02:36 -07:00