valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
72,664 Commits 24 Branches 182 Tags 341 MiB
ff96a88374
Commit Graph

72664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mike Place
09925ba353 Minor doc fixup (#35436) 
* Minor doc fixup

Refs #35387

* Include reload_grains
 2016-08-15 09:53:56 -06:00
Bo Maryniuk
8790197d86 Fix Unit test for suppressing the exception removal on non-modified repos 2016-08-15 17:35:25 +02:00
Bo Maryniuk
3f00c6997a Remove zypper's raise exception if mod_repo has no arguments and/or no changes 2016-08-15 17:35:01 +02:00
Bo Maryniuk
dd82e6a848 Add ignore_repo_failure option to suppress zypper's exit code 106 on unavailable repos 2016-08-15 15:03:53 +02:00
Mike Place
cf924343b6 Merge pull request #35341 from dincamihai/develop 
Make sha256 the default hash_type
 2016-08-15 20:23:43 +09:00
Mihai Dinca
b0f0b4effc Make sha256 the default hash_type 2016-08-15 10:02:19 +02:00
Dmitry Kuzmenko
63d8246a5c Modular minion data cache. 
Grains, pillar and mine data are now managed by salt.cache subsystem
 2016-08-15 10:34:01 +03:00
Mike Place
a0b128a85a Merge pull request #35132 from sjorge/2015.8-35121 
fixes , causing lots of mayham (onchange) with 2016.3.2 for me
 2016-08-15 16:11:22 +09:00
Mike Place
a72dc59cf4 Merge pull request #35431 from m03/win_smtp_server-state-examples1 
Improve win_smtp_server state docstrings
 2016-08-15 16:00:53 +09:00
Morrie Winnett
d270d3622a Add example yaml to win_smtp_server state 2016-08-14 15:02:41 -07:00
Mike Place
be644a58e1 Correct errant call to argspec from master. Fix ext_job_cache. (#35427) 
We were passing a string to the argpsec checker when it expects the actual func.
 2016-08-14 10:58:03 -06:00
Mike Place
a53cdc1971 Resolve stacktrace logged by highstate outputter if sls cannot be found (#35428) 
Simply return an empty string instead of a None.

Fixes #35423
 2016-08-14 10:54:15 -06:00
Nicole Thomas
6b6f38b0ea Merge pull request #35424 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-08-13 09:49:14 -06:00
Mike Place
607169a01b Merge pull request #35412 from s0undt3ch/2016.3 
Only allow one sync read to happen at a time.
 2016-08-13 08:57:29 +09:00
Mike Place
6b8d46975d Merge pull request #35414 from silviud/win_firewall_remoteip 
Win firewall remoteip
 2016-08-13 08:52:51 +09:00
Mike Place
d72f13d9c0 Merge pull request #35415 from meaksh/fix-suse-os-grains-in-develop 
Fixed 'os' and 'os_family' grains for SUSE systems in develop
 2016-08-13 08:50:52 +09:00
Mike Place
21e3874c2b Merge pull request #35421 from hrumph/saltenv_problem 
Pass saltenv to call to latest_version in list_upgrades function
 2016-08-13 08:48:04 +09:00
rallytime
a3a5496d0f Fix some items that went awry in the merge 2016-08-12 17:06:27 -06:00
rallytime
1fe0b69a6c Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/modules/blockdev.py
  - salt/modules/ddns.py
  - salt/modules/inspectlib/collector.py
  - salt/modules/linux_sysctl.py
  - salt/modules/status.py
  - salt/modules/x509.py
  - salt/utils/process.py
  - salt/utils/verify.py
  - tests/integration/__init__.py
  - tests/integration/modules/state.py
  - tests/integration/states/cmd.py
 2016-08-12 16:21:58 -06:00
david kruger
f54bf445b5 aptpkg will specify --install-recommends if enabled by the SLS 
This is to resolve #35422. The "install_recommends" flag in the SLS file
would apply --no-install-recommends to false, but if set to True it
would not enforce --install-recommends. It should not be assumed that
apt will install the recommends packages, since that can be disabled
globally.

https://github.com/saltstack/salt/issues/35422
 2016-08-12 17:40:08 -04:00
Michael Walton
3a6152b626 Pass saltenv to call to latest_version in list_upgrades function 2016-08-12 15:52:16 -04:00
Nicole Thomas
2ef596673f Provide links to the renderers in the template docs (#35406) 
* Provide links to the renderers in the template docs

Follow-up for #35360, also references #35336

* Whitespace fix
 2016-08-12 12:27:44 -06:00
Thomas S Hatch
c7b9cdf01a Fix opts ref, I forgot that salt-ssh state.pkg uses opts magic 2016-08-12 09:58:04 -06:00
Mike Place
182d9a5bf8 Merge pull request #35383 from pablo-ruth/issue_19313 
Issue 19313 / Add support of lvm thinpools
 2016-08-12 21:47:26 +09:00
Mike Place
f26d279887 Merge pull request #35391 from jf/quickpatch 
Remove comment in code about issue that no longer applies (#3614), and improve logic for argspec_report
 2016-08-12 21:44:20 +09:00
Mike Place
85ecac8e6e Merge pull request #35392 from m03/more-win_iis-unit-tests 
Add list_apps, list_bindings, remove_site tests to win_iis_test
 2016-08-12 21:43:36 +09:00
Mike Place
b3e9e98b40 Merge pull request #35393 from deniszh/2016.3_fix35350 
No need to run ddns update every time
 2016-08-12 21:40:36 +09:00
Mike Place
a5fe05b7f9 Merge pull request #35407 from hu-dabao/fix-35094 
[Fix-35094] None will not be added to grains which generate [none]
 2016-08-12 21:34:05 +09:00
Pablo Suárez Hernández
7c1a5f8bc6 Fixed 'os' and 'os_family' grains for SUSE systems 2016-08-12 13:33:27 +01:00
Mike Place
06d5aac5c5 Merge pull request #35409 from m03/add-win_pki-examples 
Add example yaml to win_pki state
 2016-08-12 21:33:27 +09:00
Mike Place
4dc776ffbf Merge pull request #35411 from eliasp/2016.3-modules.event-handle-file_client-opt 
modules.event.send(): Prevent backtrace for masterless Minions
 2016-08-12 21:29:01 +09:00
Silviu Dicu
750fde2931 tests and remote_ip renamed to remoteip as per netsh 2016-08-12 08:01:14 -04:00
Silviu Dicu
8a5c9ec574 w/o _ 2016-08-12 08:01:14 -04:00
Silviu Dicu
dd7d6094b4 remoteip for win_firewall 2016-08-12 08:01:14 -04:00
Pedro Algarvio
f54b3cc514
Only allow one sync read to happen at a time. 2016-08-12 12:19:09 +01:00
Mike Place
3646cf1afa Additional checks on master and integration test 2016-08-12 20:06:20 +09:00
Elias Probst
8d7244bdd9
modules.event.send(): Also check for file_client and use_master_when_local opts 2016-08-12 12:27:02 +02:00
Mike Place
09efde7634 Splat the list into os.path.join 2016-08-12 19:08:43 +09:00