Commit Graph

75836 Commits

Author SHA1 Message Date
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
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
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
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
86b4b77bfe Merge pull request #39058 from sergeizv/fix-lvm-fullversion
Fix salt.modules.linux_lvm.fullversion
2017-01-31 12:01:12 -07:00
Mike Place
721b245f90 Merge pull request #39066 from techhat/issue39051
127.0.0.0/8 is all loopback
2017-01-31 11:43:21 -07:00
Mike Place
c54d9f4e2a Merge pull request #39071 from sergeizv/fix-lvm-pvcreate
Fix modules.linux_lvm.pvcreate on existing LVM PVs
2017-01-31 11:36:53 -07:00
Nasenbaer
15db8d47ed Fix for #38704 archive extracted and dockerio states
Do not run file managed as state.single as this conflicts (and fails)
when additional state runs are already scheduled.
2017-01-31 11:51:04 -06:00
Nicole Thomas
122422bc08 Bump openstack deprecation notice to Oxygen (#39067)
I spoke with @gtmanfred and this isn't ready to be removed just yet,
so we're bumping the removal to Oxygen.
2017-01-31 10:21:13 -07:00
Sergei Zviagintsev
f1e3e86e6a Fix modules.linux_lvm.pvcreate on existing LVM PVs
If all the devices submitted to pvcreate() are already initialized as
LVM physical volumes and override is True (which is default), pvcreate()
should return True and no futher actions should be made. The
'not cmd[1:]' check which is suited for this scenario is incorrect, as
we previously filled the 'cmd' list with two elements and thus the
condition would be always False. This would cause pvcreate() to call the
pvcreate executable with no arguments if all the submitted devices are
already initialized as LVM PVs.

Fixes #39070
2017-01-31 17:57:57 +01:00
Sergei Zviagintsev
0f84ca2487 Add test for modules.linux_lvm.pvcreate on existing LVM PVs
If all the devices submitted to pvcreate() are already initialized as
LVM physical volumes, pvcreate() should return True and no futher
actions should be made.
2017-01-31 17:57:21 +01:00
Sergei Zviagintsev
3967992bfd Fix test for modules.linux_lvm.pvcreate
pvdisplay() would be called by pvcreate() twice: firstly to check
whether a device is already initialized for use by LVM and then to
ensure that the pvcreate executable did its job correctly. The test
replaces pvdisplay() with a mock that always returns True and thus
pvcreate() would think that a specified device is already initialized
and exit. In the other words, instead of testing physical volume
initialization the test simulates a case with all the submitted
devices already initialized.

Fix it by replacing pvdisplay with a mock that returns False on the
first call (thus pvcreate thinks that a device is not a PV yet) and True
on the second call (after the pvcreate executable is called).
2017-01-31 17:49:28 +01:00
Joseph Hall
ea43bb8101 127.0.0.0/8 is all loopback 2017-01-31 09:07:46 -07:00
Nicole Thomas
88b171f863 Merge pull request #39048 from rallytime/merge-2016.11
[2016.11] Merge forward from 2016.3 to 2016.11
2017-01-31 08:55:48 -07:00
Sergei Zviagintsev
e46c89f9ed Fix salt.modules.linux_lvm.fullversion
Due to an indentation error fullversion() returns only the last string
of 'lvm version' output. Fix it.

Fixes #39057
2017-01-31 16:26:08 +01:00
Sergei Zviagintsev
fb7ef99838 Fix mock emulating lvm version
'lvm version' produces multiline output whereas test_version and
test_fullversion use mocks with single-line output. Use real-life
'lvm version' output in those mocks instead.
2017-01-31 16:22:38 +01:00
C. R. Oldham
92a542fa21 Add CLI Examples so tests will pass (#39035)
* Add CLI Examples so tests will pass

* Add CLI Examples so tests will pass
2017-01-30 17:04:30 -07:00
rallytime
b2b3989773 Merge branch '2016.3' into '2016.11'
Conflicts:
  - salt/engines/__init__.py
  - salt/loader.py
2017-01-30 16:58:31 -07:00
Nicole Thomas
a24af5ac46 Merge pull request #39047 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2017-01-30 16:48:13 -07:00
rallytime
b732a1f646 Merge branch '2015.8' into '2016.3'
No conflicts.
2017-01-30 16:45:16 -07:00
Nicole Thomas
56ccae6ff7 Add 2015.8.14 release notes file (#39046) 2017-01-30 16:44:00 -07:00
Nicole Thomas
fef1b1133d Add 2016.3.6 release notes file (#39045) 2017-01-30 16:43:50 -07:00
Nicole Thomas
0943872fab Add 2016.11.3 release notes file (#39044) 2017-01-30 16:43:40 -07:00
Nicole Thomas
7c43f4ac32 [2016.3] Update release numbers for doc build (#39042) 2017-01-30 15:52:33 -07:00
Nicole Thomas
27081d6520 [2016.11] Update release numbers for doc build (#39040) 2017-01-30 15:51:09 -07:00
Nicole Thomas
424e68436e Update 2016.11.2 release notes (#39039) 2017-01-30 15:40:00 -07:00
Nicole Thomas
ff324599d5 Update 2016.3.5 release notes (#39038) 2017-01-30 15:39:47 -07:00
Nicole Thomas
5943fe65d3 Update 2015.8.13 release notes (#39037) 2017-01-30 15:39:33 -07:00
Mike Place
5b09dc4198 Merge pull request #39028 from terminalmage/clarify-delimiter-argument
Clarify delimiter argument
2017-01-30 11:20:25 -07:00
Nicole Thomas
1ff359fa58 Add CLI Example for rest_sample_utils.get_test_string function (#39030)
Fixes test_valid_doc test that is failing on 2016.11
2017-01-30 10:34:25 -07:00
C. R. Oldham
f13fb9ef1e Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (#38899) 2017-01-30 10:32:23 -07:00
C. R. Oldham
a7fc02e196 Ungate the status.py module and raise unsupported errors in functions not executeable on Windows. (#39005) 2017-01-30 09:21:12 -07:00