Commit Graph

77776 Commits

Author SHA1 Message Date
rallytime
eb61788f87 Merge branch '2016.11' into 'develop'
Conflicts:
  - doc/ref/runners/all/index.rst
  - salt/modules/win_lgpo.py
  - salt/states/dockerio.py
2017-02-01 16:36:45 -07:00
Mike Place
4480bd8858 Merge pull request #39114 from cloudflare/BGP-RUNNER
New networking runner: BGP
2017-02-01 16:05:08 -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
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
6100467288 Merge pull request #39036 from cro/no_docs_develop
Add CLI Examples so tests will pass (counterpart to #39035)
2017-02-01 12:31:29 -07:00
Mike Place
ceccb14ffd Merge pull request #39050 from The-Loeki/cache-roster2
Introduction of a new Salt-SSH cache roster with vastly expanded options
2017-02-01 12:25:24 -07:00
Mike Place
4ed8085d27 Merge pull request #39060 from harisokanovic/dev/hokanovi/hwclock-sync
system: Update hardware clock on date/time change
2017-02-01 12:22:20 -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
75bb1d88eb Merge pull request #39082 from bmwiedemann/systemdsleep
Add salt-minion.sleep
2017-02-01 11:57:42 -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
8ae6c54243 Merge pull request #39103 from arif-ali/fix_iface_lower
fixes #31393 don't convert the iface to lower case
2017-02-01 11:28:13 -07:00
Mike Place
4cd698ca33 Merge pull request #39104 from githubcdr/develop
Do not use name resolving for --notrim check
2017-02-01 11:25:27 -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
Mircea Ulinic
c051f7ae7b BGP runner doc 2017-02-01 18:17:19 +00:00
Mircea Ulinic
ee45e1d8a6 BGP runner 2017-02-01 17:50:28 +00: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
cDR
351c039257 Do not use name resolving for --notrim check
This causes a significant delay on servers with many open connections
2017-02-01 11:02:10 +01: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
Haris Okanovic
c5f832b9e3 system: Update hardware clock on date/time change
Update hardware clock so that date/time changes persist
through reboot.

Add hwclock check to system integration test. Bump tolerance
of _same_times() helper to account for longer run-time of set
operations. Updating hardware rtc's can take more than 2 seconds.

Signed-off-by: Haris Okanovic <haris.okanovic@ni.com>
Reviewed-by: Sergey Kizunov <sergey.kizunov@ni.com>
Reviewed-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Reviewed-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
2017-01-31 17:40:40 -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
Ronald van Zantvoort
3873c6be61 Remove commented-out debug lines 2017-01-31 22:09:07 +01:00
Bernhard M. Wiedemann
c2cef98747 Add salt-minion.sleep
for use with systemd to be installed in
/usr/lib/systemd/system-sleep/salt-minion.sleep

To avoid stale minion-master connections as described in
https://bugzilla.opensuse.org/show_bug.cgi?id=1018791
2017-01-31 22:04:04 +01:00
Mike Place
b01d99eaa8 Merge pull request #39007 from cloudflare/SALT-EXEC
New runner function: salt.execute
2017-01-31 14:02:57 -07:00
Mike Place
1ccb365945 Merge pull request #39002 from rallytime/fix-38111
Pass win_* options as kwargs when calling file.manage_file
2017-01-31 13:51:39 -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
Ethan Moore
c3aaa536f3 _in_range_inclusive class method incorrectly called isinstance 2017-01-31 20:40:41 +00:00
Ethan Moore
ce263f9372 set_computer_policy and set_user_policy call "set" by the original function name (set) instead of the aliased function name set_ 2017-01-31 20:39:56 +00:00
Ethan Moore
ff7d74bfb0 correct tool extension guid for user registry policies 2017-01-31 20:39:55 +00:00
Ethan Moore
08f0078ef3 spelling correction 2017-01-31 20:39:54 +00:00
Ethan Moore
5fc40485f7 add updating gpt.ini file when ADM template policies are modified (gpt.ini file must exist with proper data for ADM policies to apply) 2017-01-31 20:39:53 +00:00
Mike Place
a249a3490a Merge pull request #39031 from cloudflare/GRAINS-RUNNER
mine.update runner
2017-01-31 13:39:11 -07:00
Mike Place
882c5cc889 Merge pull request #39072 from Inveracity/patch-3
bugfix adding subnetwork option to gce
2017-01-31 13:38:11 -07:00
Mike Place
2f532ff9f8 Merge pull request #39080 from kraney/boto_lambda_envvar
Added Lambda environment variables support to boto_lambda modules/states
2017-01-31 13:20:40 -07:00
Mike Place
8a4d210959 Merge pull request #39079 from gtmanfred/2016.3
use_keystoneauth should default to False if not specified
2017-01-31 13:12:46 -07:00
Mike Place
9836d7dd29 Merge pull request #39076 from terminalmage/pr-38705
Re-submit PR #38705 against 2016.11 branch
2017-01-31 13:11:55 -07:00
Mike Place
9bdf2c1f08 Fix trailing whitespace 2017-01-31 12:39:35 -07:00
Mike Place
bdaa52ac4e Merge pull request #39043 from twangboy/develop
SaltTesting fixes for Windows
2017-01-31 12:27:39 -07:00
Mike Place
86b4b77bfe Merge pull request #39058 from sergeizv/fix-lvm-fullversion
Fix salt.modules.linux_lvm.fullversion
2017-01-31 12:01:12 -07:00