Commit Graph

77806 Commits

Author SHA1 Message Date
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
Mike Place
f97397e1a9
Doc example 2017-01-31 15:36:58 -07:00
Mike Place
b92148c610
Add a function to list extmods 2017-01-31 15:35:04 -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
Winston Liu
c2d35d181f update botocore dependencies, skip if not met. 2017-01-31 10:49:34 -08:00
Winston Liu
01718e5802 function_present for boto_lambda state module now accepts Lambda Environment Variables. 2017-01-31 10:49:03 -08: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
Mike Place
445a4d025b Additional newline to separate funcs
Needed for pylint
2017-01-31 11:30:38 -07:00
Mike Place
fd7911f65b Merge pull request #39073 from sergeizv/grammar-fixes-in-docstrings
Grammar fixes in docstrings
2017-01-31 11:25:26 -07:00
Mike Place
fa8053045b Merge pull request #39074 from sergeizv/remove-bad-comment
Remove bad comment
2017-01-31 11:23:15 -07:00
Daniel Wallace
bdd142b4eb use_keystoneauth should default to False if not specified 2017-01-31 12:14:40 -06: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
C. R. Oldham
fb9d884152 Add CLI Examples so tests will pass 2017-01-31 10:23:06 -07: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
f4bf77a996 Fix test name (#39061)
Remove an unnecessary underscore character from the name of the
linux_lvm.lvdisplay test:

  test__lvdisplay -> test_lvdisplay
2017-01-31 10:20:13 -07:00
Inveracity
fc4e51a295 bugfix adding subnetwork option to gce
Previously when deploying to custom networks salt-cloud would fail with the error described in #31071
Now it is possible to specify a subnetwork in the profile, to deploy to a custom network and a specific subnet in that network.
2017-01-31 18:08:26 +01:00
Nicole Thomas
73286ac9e7 Merge pull request #39064 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-01-31 10:07:06 -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
Sergei Zviagintsev
7faa13adb3 Remove bad comment
The comment seems to stay there by mistake as it has no relation to
what's really going on (i.e. checking whether the device is already an
LVM PV). Remove it.
2017-01-31 17:48:35 +01:00
Joseph Hall
ea43bb8101 127.0.0.0/8 is all loopback 2017-01-31 09:07:46 -07:00
rallytime
0e5fa1b8ae Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/modules/vsphere.py
2017-01-31 08:57:44 -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
Ronald van Zantvoort
2e6d915cbf Salt-SSH cache roster lint fixes 2017-01-31 13:01:42 +01:00
Ronald van Zantvoort
a68d47de73 Introduction of a new Salt-SSH cache roster with vastly expanded options 2017-01-31 12:19:03 +01:00