valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,100 Commits 24 Branches 182 Tags 341 MiB
580e0d4aa7
Commit Graph

69100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Thomas S Hatch
a381f02cfe Always deploy the thin to /var/tmp 2016-08-17 11:29:46 -06:00
rallytime
ff212d8976 Whitespace fix 2016-08-17 11:18:49 -06:00
Erik Johnson
5b5f19d269 Update zypper unit test to reflect call to config.get 2016-08-17 11:43:22 -05:00
Erik Johnson
2730edb516 Add note about systemd-run usage in package states 2016-08-17 11:43:22 -05:00
Erik Johnson
e2d9e87e10 salt/modules/systemd.py: Use systemd-run --scope where needed 2016-08-17 11:43:22 -05:00
Erik Johnson
22919a25bc Notify systemd on salt-api start 2016-08-17 11:43:22 -05:00
Erik Johnson
a40b3f8a08 Notify systemd on syndic start 2016-08-17 11:43:22 -05:00
Erik Johnson
e847d3af30 Notify systemd on minion start 2016-08-17 11:43:22 -05:00
Erik Johnson
d648887afc salt/modules/zypper.py: Use systemd-run --scope where needed 2016-08-17 11:43:21 -05:00
Erik Johnson
2e17976722 salt/modules/yumpkg.py: Use systemd-run --scope where needed 2016-08-17 11:43:21 -05:00
Erik Johnson
86b59c1e74 salt/modules/pacman.py: Use systemd-run --scope where needed 2016-08-17 11:43:21 -05:00
Erik Johnson
e32d92c6d5 salt/modules/ebuild.py: Use systemd-run --scope where needed 2016-08-17 11:43:20 -05:00
Erik Johnson
c7d21d3ae3 salt/modules/aptpkg.py: Use systemd-run --scope where needed 2016-08-17 11:43:20 -05:00
rallytime
bbf7ce121b Remove final self.MINION_CONNECT_TIMEOUT ref 2016-08-17 10:41:22 -06:00
rallytime
c305d8d99b Merge branch '2015.8' into '2016.3' 
Conflicts:
  - doc/conf.py
  - tests/runtests.py
 2016-08-17 10:37:57 -06:00
Erik Johnson
f83e0ef242 Add unit tests for salt.utils.systemd 2016-08-17 11:30:14 -05:00
Mike Place
b3b28cb760 Might be a good idea to be able to download the software we make (#35513) 
Docs are a thing.
 2016-08-17 09:47:49 -06:00
Nicole Thomas
e86a39a115 Merge pull request #35516 from rallytime/bp-34441 
Back-port #34441 to 2016.3
 2016-08-17 09:47:23 -06:00
Nicole Thomas
45080d9860 Merge pull request #35517 from rallytime/bp-34502 
Back-port #34502 to 2016.3
 2016-08-17 09:47:10 -06:00
Morgan Willcock
0b95b85e69 Check for all success return codes in dism state 
Only checking for 0 returns a failure where a reboot is needed.
 2016-08-17 16:27:52 +01:00
markuskramerIgitt
32da48df08 setup.py will not print each individual file 2016-08-17 08:35:44 -06:00
markuskramerIgitt
698a076a39 Completely remove Python and verify 2016-08-17 08:35:44 -06:00
markuskramerIgitt
7406bd22a6 Errors will stop the scripts 2016-08-17 08:35:44 -06:00
markuskramerIgitt
e47c661cb0 Copy and delete silently, do not list each file 2016-08-17 08:34:06 -06:00
Mike Place
9f87081cef Merge pull request #35302 from Ch3LL/add_job_cache_test 
Add job cache test
 2016-08-17 19:45:28 +09:00
Mike Place
1c82c6bee5 Merge pull request #35512 from cachedout/fixup_35419 
Fixup 35419
 2016-08-17 19:11:17 +09:00
Mike Place
253662541a Fix import 2016-08-17 19:10:29 +09:00
Mike Place
c1deb945d7 Merge pull request #35429 from tankywoo/fix-iptables-target-options 
Fix iptables target options with no arguments
 2016-08-17 19:05:17 +09:00
Mike Place
678759ba6c Merge pull request #35495 from rallytime/fix-35458 
Use correct deprecated notation instead of a warning for apache_module.enable state function.
 2016-08-17 18:36:40 +09:00
Mike Place
e1a373fa4c Merge pull request #35497 from deepakhj/2015.8 
Fixes spacing in requirements files
 2016-08-17 18:34:15 +09:00
Mike Place
5bd44b10a7 Merge pull request #35498 from rallytime/file-state-docs 
Add supported templates list to all template doc references in file state
 2016-08-17 18:33:36 +09:00
Erik Johnson
5b12f030c6 Add func to salt.utils.systemd to tell if scopes are available 2016-08-17 04:02:56 -05:00
Erik Johnson
4048255ed6 Merge pull request #35508 from terminalmage/update-docstring 
Add Carbon to versionadded for git.diff
 2016-08-17 01:17:12 -05:00
Erik Johnson
67c945fce0 Add Carbon to versionadded for git.diff 2016-08-17 01:15:40 -05:00
Ch3LL
ccb2a5cadf remove unused imports 2016-08-16 15:21:20 -06:00
Ch3LL
512ae81dfd remove TMP and add integration.TMP 2016-08-16 15:18:24 -06:00
rallytime
6190b2d738 Add supported templates list to all template doc references in file state 
Refs #35336
 2016-08-16 14:24:07 -06:00
Deepak Jagannath
685db4ab88 Fix spacing 2016-08-16 13:16:59 -07:00
rallytime
9bae3d09a6 Use correct deprecated notation instead of a warning. 
This should help make the documentation more clear to fix #35458.
 2016-08-16 14:06:28 -06:00
Sergey Kizunov
cf2e2daab9 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-16 12:58:07 -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
C. R. Oldham
cec7f6a7ec remove unneeded import 2016-08-16 12:08:47 -06:00
Daniel Wallace
2d8ec1e9db use __opts__ in salt.utils.cloud for cache functions 2016-08-16 12:03:45 -05: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
C. R. Oldham
e31555345f Add timeout documentation. 2016-08-16 09:54:54 -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
C. R. Oldham
901ab8b74c Remove unnecessary log statements 2016-08-16 09:39:20 -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