Commit Graph

75872 Commits

Author SHA1 Message Date
Mike Place
036f36dc9b Merge pull request #39179 from mcalmer/fix-dockerng-error-parsing
fix error parsing
2017-02-06 10:56:59 -07:00
Mike Place
30f83156cb Merge pull request #39189 from morganwillcock/sockstat
Fix NetBSD sockstat parsing
2017-02-06 10:28:07 -07:00
Morgan Willcock
344d13eff5 Fix NetBSD sockstat example 2017-02-06 11:38:34 +00:00
Morgan Willcock
64b693195c Fix NetBSD sockstat parsing
Fixes NetBSD sockstat parsing so that presence events are fired correctly.
2017-02-06 11:08:31 +00:00
Michael Calmer
6750ccd78e fix error parsing 2017-02-04 16:05:45 +01:00
Thomas S Hatch
6a9704189f Merge pull request #39141 from UtahDave/fix_cache_lookup_ZD1187
Don't overwrite the minion_ids var that was passed
2017-02-03 13:56:24 -07:00
Nicole Thomas
d19cee716f Merge pull request #39164 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-02-03 10:57:06 -07:00
Mike Place
ed12512045 Merge pull request #39152 from twangboy/win_installer
Remove files not needed by salt-minion
2017-02-03 10:11:10 -07:00
rallytime
6504bb6b02 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/modules/pillar.py
  - salt/states/archive.py
  - tests/integration/states/archive.py
2017-02-03 09:48:58 -07:00
Erik Johnson
9de08af950 Apply fix from #38705 to 2016.3 branch (#39077)
* Apply fix from #38705 to 2016.3 branch

This is a better fix and covers more use cases than the sudo_user one.

* Remove saltenv param from internal state func call

This was probably redundant in the first place, but since state.sls,
state.highstate, etc. accept a saltenv param and the actual state
functions do not, this results in multiple values passed for the saltenv
param.

Remove this argument and let file.get_managed reference __env__
internally.

* Update archive tests to match 2016.11 branch
2017-02-03 09:35:49 -07:00
Daniel Wallace
da3053ea9b update vmware getting started doc (#39146)
The IDE entry needs to be a dictionary entry.  Without this, it is seen
as a string.  This is probably done this way so that in the future,
configurations can be added to the IDE device.
2017-02-03 09:00:00 -07:00
twangboy
5ff8a14317 Fix problem deleting files 2017-02-02 18:12:18 -07:00
twangboy
4524dd49d4 Remove files not needed by salt-minion 2017-02-02 17:20:12 -07:00
garethgreenaway
e78ca0f575 Fixing a weird edge case when using salt syndics and targetting via pillar. Without this fix the master of masters ends up in an infinite loop since the data returned from the minions is differently structured than if a sync was not in use. (#39145) 2017-02-02 16:05:26 -07:00
lomeroe
8c0dc9162a correct issue when running get with return_not_configured=True (#39085)
lint indentation fixes
2017-02-02 16:04:42 -07:00
lomeroe
26eea61678 have _in_range_inclusive function attempt to convert a string to an int for the test (allow string based numbers to be verified to be in range). Specifically, this allows the CachedLogonsCount policy to be set (stored in the registry as a REG_SZ and specified as a string number when passed to the module) (#39086) 2017-02-02 16:03:44 -07:00
Mike Place
4eec641b65 Merge pull request #38970 from gtmanfred/2016.11
when using local_cache we have to pass the list of minions
2017-02-02 12:24:38 -07:00
David Boucha
0340614d15 return all minions' grains if no tgt 2017-02-02 11:58:42 -07:00
David Boucha
f833bf3a79 Don't overwrite the minion_ids var that was passed
The minion_ids var that was passed into the function was being
overwritten by a list of ALL the minion ids found in the minion cache

Fixes: #38003

ZD1187
2017-02-02 11:38:01 -07:00
C. R. Oldham
cd8077ab81 Merge pull request #38804 from alexbleotu/root_dir_fix-2016.3-gh
Second attempt to fix prepending of root_dir to paths
2017-02-02 09:10:36 -07:00
Erik Johnson
75da6f461b Fix archive.list on Windows (#39128)
The external_error ZipInfo attribute is handled differently on Windows,
so resort to the filename attribute instead.
2017-02-02 08:44:53 -07:00
Nicole Thomas
f2c309af73 Back-port #36714 to 2016.11 (#39133)
* Fix: local variable result referenced before assignment

* Fix: if 'path' variable is None convert it into an empty string
2017-02-02 08:35:46 -07:00
Ivan Babrou
6ffeda3ee5 Clarify ipv6 option for minion and inteface for master, closes #39118 (#39131)
* Clarify ipv6 option for minion and inteface for master, closes #39118

* Add ipv6 reference
2017-02-02 08:35:00 -07:00
Alexandru Bleotu
b3bdd3b04a Add missing whiteline 2017-02-02 10:23:22 +00:00
Alexandru Bleotu
c7715acd53 Merge pull request #3 from cro/ab_rootdirfix
When running testsuite, salt.syspaths.ROOT_DIR is often empty.
2017-02-02 10:02:18 +00:00
C. R. Oldham
e8cbafaaf1 When running testsuite, salt.syspaths.ROOT_DIR is often empty. 2017-02-01 15:57:38 -07:00
lomeroe
8b34fcdb45 correct checking of policy_class to compare with lower() version of the specified string (#39084) 2017-02-01 15:51:34 -07:00
lomeroe
8ce928f050 Backport #38779 to 2016.11 (#39089)
* ignore ADMX/ADML files with syntax errors

* narrow except for XML Syntax Error on admx file

* attempt to remove any "encoding='unicode'" from ADMX/ADML files if lxml does not support the encoding

* lint fixes

* fix bonehead typo
2017-02-01 15:50:42 -07:00
lomeroe
8a00ecfb79 update adml text search to use 'starts-with' as some policies text has trailing spaces (#39090) 2017-02-01 15:43:01 -07:00
lomeroe
9dccb9fbe3 correctly handle scenario when "storeAsText" is True on a decimal/longDecimal element object (#39088)
handle scenario that gpedit has not been run on a system (Machine and User GroupPolicy sub-folders do not exist)
handle scenario that startup/shutdown script policy file does not exist
2017-02-01 15:26:13 -07:00
Erik Johnson
646b9ea4e5 Don't abort pillar.get with merge=True if default is None (#39116)
* Don't abort pillar.get with merge=True if default is None

This prevents a SaltInvocationError from being raised if the default is
loaded from a import_yaml jinja macro and the file being loaded is empty
(which is an entirely valid use case). In these cases, the loaded
default would be None, which we don't want to cause an exception.

* Add test case for issue 39062
2017-02-01 15:07:31 -07:00
Nicole Thomas
50d72da3f6 Merge pull request #39122 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-02-01 14:41:58 -07:00
rallytime
a782b00ee1 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/cloud/clouds/openstack.py
2017-02-01 13:35:10 -07:00
Mike Place
cc9b69b6bc Merge pull request #39091 from terminalmage/update-test-valid-docs
Run test_valid_docs in batches
2017-02-01 12:09:04 -07:00
Mike Place
f8a6863d98 Merge pull request #39087 from lomeroe/bp-37375
Backport #37375 to 2016.11
2017-02-01 12:02:57 -07:00
Mike Place
c4c6e701af Merge pull request #39094 from rallytime/doc-build-warnings
Add a bunch of missing doc module references
2017-02-01 11:56:26 -07:00
Mike Place
d302bb747e Merge pull request #39108 from janhorstmann/fix-x509-state
[Bugfix] Fix state x509.crl_managed
2017-02-01 11:32:42 -07:00
Mike Place
bf61ec9515 Merge pull request #39107 from cloudflare/FIX-38638
Check if data['return'] is dict type
2017-02-01 11:21:45 -07:00
Alexandru Bleotu
b12dd44a26 Merge pull request #1 from cro/ab_rootdirfix
Remove extra if statements (rstrip will check for the presence anyway).
2017-02-01 17:12:41 +00:00
C. R. Oldham
bffc537aca Remove extra if statements (rstrip will check for the presence anyway). 2017-02-01 09:40:45 -07:00
jhorstmann
9f5c532510 [Bugfix] Fix state x509.crl_managed
A necesasary variable was overwritten with a bool breaking the state
2017-02-01 16:21:37 +01:00
Mircea Ulinic
7c34815979 Check if data['return'] is dict type 2017-02-01 12:18:10 +00:00
Erik Johnson
d76f0380d0 add debug logging for batch vars 2017-02-01 00:05:21 -06:00
Erik Johnson
b4afea2a25 Don't fail test if data is empty
This keeps trimmed output from failing the test. We are still testing
with a specific module lower down in the test, so this doesn't reduce
our test coverage.
2017-02-01 00:05:21 -06:00
Erik Johnson
b3a5d549c1 Account for trimmed value in 'salt -d' output 2017-02-01 00:05:21 -06:00
Erik Johnson
909916c78e Run test_valid_docs in batches
This test fails often due to being trimmed, thanks to
salt.utils.dicttrim trimming values > max_event_size.

This commit changes this test so that it runs sys.doc twice, ensuring
that the return from sys.doc (for now) is not trimmed.
2017-02-01 00:05:05 -06:00
jak3kaj
cac0bec3f6 Update primary bonding option in rh_ip.py (#39069)
* Update rh_ip.py

Add support for the "primary" bonding option in active-backup, balancd-tlb and balance-alb type bonds for RH.  This is used to specify a preferred slave for the link.

Remove support for the balance-xor bond type, since it is not supported by the kernel.

Reference: https://www.kernel.org/doc/Documentation/networking/bonding.txt

"The primary option is only valid for active-backup(1), balance-tlb (5) and balance-alb (6) mode."

* Update rh_ip.py
2017-01-31 16:12:20 -07:00
jak3kaj
a0861f0701 Update primary bonding option in debian_ip.py (#39068)
* Update debian_ip.py

Add support for the "primary" bonding option in active-backup, balancd-tlb and balance-alb type bonds for Debian.  This is used to specify a preferred slave for the link.

Remove support for the balance-xor bond type, since it is not supported by the kernel.

Reference: https://www.kernel.org/doc/Documentation/networking/bonding.txt
	
"The primary option is only valid for active-backup(1), balance-tlb (5) and balance-alb (6) mode."

* Update debian_ip.py
2017-01-31 16:10:57 -07:00
rallytime
b866427f59 Add a bunch of missing doc module references
Also added an index.rst file for executors, renamed the
azurearm.rst file (Was misspelled with "azureare"), and
removed the xbps-pkg.rst file since that is an invalid
reference.
2017-01-31 15:12:34 -07:00
Erik Johnson
bcee3d1ef6 Move fileclient tests to tests/integration/fileserver/fileclient_test.py (#39081)
Being in the root of tests/integration/, these were not being run in
jenkins and would only run if executed manually using the -n flag in
runtests.py.
2017-01-31 13:44:50 -07:00