98856 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	352afc90bc	Merge pull request #50432 from cbosdo/fluorine-backport ... Update create disk fix	2018-11-08 09:03:17 -07:00
Cédric Bosdonnat	e6f5b66077	virt: fix pylint 2.x errors	2018-11-08 15:44:48 +01:00
Cédric Bosdonnat	55823cb3a4	virt.update: create missing disk images ... When running virt.update to add new virtual disks, the disks are defined, but the actual image is not created. Use the same function than virt.init to implement this.	2018-11-08 15:44:48 +01:00
Cédric Bosdonnat	040bf4a39c	Fix virt.pool_info usage in virt.update ... pool_info was changed to return a dict of pool infos even for a single pool search. Adapt calls of it in the virt module.	2018-11-08 15:44:48 +01:00
Mike Place	333a133f83	Merge pull request #50385 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-11-05 13:51:16 -07:00
Mike Place	cf14408a49	Merge pull request #50362 from twangboy/fix_test_matcher ... Fix test_matcher on Windows	2018-11-05 12:36:52 -07:00
Mike Place	369886aa28	Merge pull request #50365 from twangboy/fix_test_manage ... Fix `integration.runners.test_manage` on Windows	2018-11-05 12:35:55 -07:00
twangboy	b0341ea7dc	Remove flaky test	2018-11-05 12:15:06 -07:00
rallytime	a02564c7c0	Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/utils/win_dacl.py	2018-11-05 14:06:42 -05:00
Nicole Thomas	f2d4b7b098	Merge pull request #50379 from cbosdo/fluorine-backport ... Virt disk fixes - Fluorine backport	2018-11-05 14:03:53 -05:00
Cédric Bosdonnat	f9b6171aed	virt: fix disk targets before diffing ... Ensure the disk target devices are unique within the disks in the new list before diffing them. Libvirt will reorder the disks based on their targets. If the users gives a disk order that is not consistent with the currently running VM, then it's his fault giving us wrong data.	2018-11-05 17:07:45 +01:00
Cédric Bosdonnat	d1ec0da2c0	virt: try hard not to break the disk order in update ... While updating a domain, we need to ensure the disks are in the order defined by the user.	2018-11-05 17:07:34 +01:00
Cédric Bosdonnat	99b453360f	virt: use a list of disks for the domain template ... Using a dict breaks the disk order which might be of importance to users. It only hides the disk name from the template rendering, but that one property wasn't used.	2018-11-05 17:07:19 +01:00
Cédric Bosdonnat	a75dcb3e9e	virt: introduce disk device type ... Disk devices can be of several types and we need to handle them in order to update existing VMms with floppy or cdrom devices. cdrom devices are particularly interesting since they can also have no source.	2018-11-05 17:05:55 +01:00
Cédric Bosdonnat	9099179b7a	Virt: VM disk source may not be specified ... Disks like cdroms have no source element. We need to handle iit in the disks comparison or we'll have exceptions when updating VMs that haven't been generated by salt virt module.	2018-11-05 17:04:48 +01:00
Nicole Thomas	c29f9d23a5	Merge pull request #50342 from Ch3LL/fix_unless_onlif_mac ... Fix test_issue_30161_unless_and_onlyif_together for MacOSX	2018-11-05 09:22:21 -05:00
Nicole Thomas	426bb298e2	Merge pull request #50346 from rallytime/adjust-legacy-startup-deprectation ... Extend deprecation warning for enable_legacy_startup_events to Sodium	2018-11-05 09:20:31 -05:00
Nicole Thomas	3022b7db5b	Merge pull request #50347 from garethgreenaway/41342_beacon_state_module_fixes ... [2018.3] Fixes to beacon state module	2018-11-05 09:19:40 -05:00
Nicole Thomas	929525af1a	Merge pull request #50358 from garethgreenaway/41583_mount_swap_test_true_wrong_results ... [2018.3] fixes to function mount.swap in mount state	2018-11-05 09:16:49 -05:00
Nicole Thomas	f560570e84	Merge pull request #50368 from twangboy/fix_test_standard ... Fix `integration.client.test_standard` on Windows	2018-11-05 08:58:19 -05:00
Nicole Thomas	4120b9905a	Merge pull request #50369 from twangboy/fix_test_batch ... Fix `integration.cli.test_batch` for Window	2018-11-05 08:57:27 -05:00
twangboy	9858c4d792	Fix some lint	2018-11-03 10:53:49 -06:00
twangboy	c5a9af7fbe	Increase timeout	2018-11-02 18:21:35 -06:00
twangboy	6948274c25	Add some timeouts	2018-11-02 17:11:50 -06:00
twangboy	d968b7df0a	Adds timeouts to the manage.down runner ... Passes timeouts to the runner from the test	2018-11-02 16:17:36 -06:00
twangboy	b4b0a71a0f	Fix test_matcher on Windows ... Fixes a timeout issue in test_salt_documentation_arguments_not_assumed	2018-11-02 14:30:31 -06:00
Gareth J. Greenaway	b8ded8bf5f	Updating the swap function in the mount.swap function also check the device name when checking the fstab data. Updating tests to reflect new behavior.	2018-11-02 12:23:24 -07:00
Gareth J. Greenaway	8885d1ff3d	Merge branch '2018.3' into 41342_beacon_state_module_fixes	2018-11-02 12:08:19 -07:00
Shane Lee	3ffa3921b7	Merge pull request #50006 from lomeroe/issue48782_2018.3 ... Correct more issues in lgpo	2018-11-02 10:32:28 -06:00
lomeroe	dc58252e52	update to use a single line if statement when dealing with prepended ... text add comment on using +2	2018-11-02 08:03:43 -05:00
lomeroe	0e011ad805	add runTest method to class for PY2	2018-11-02 08:03:43 -05:00
lomeroe	377ec095ab	add a test for #47784	2018-11-02 08:03:43 -05:00
lomeroe	0a14505e21	change backslashes in comment string to fix lint error	2018-11-02 08:03:43 -05:00
lomeroe	02181d385a	add fix/test for #50079 ... ADML display names that have a single match in each Computer/User policy would not work with the "short" display name, requiring either the "long" name or the explicit policy name	2018-11-02 08:03:43 -05:00
lomeroe	05f29511a4	more lint fixes	2018-11-02 08:03:43 -05:00
lomeroe	94b33350a8	lint fixes in test	2018-11-02 08:03:43 -05:00
lomeroe	2a79626538	update test to actually work ... update lgpo module to catch another possible case of multiple ADML names	2018-11-02 08:03:43 -05:00
lomeroe	42840ecd9b	add missing comma in function call	2018-11-02 08:03:43 -05:00
lomeroe	c283f50074	Log a warning message instead of an exception when a SID cannot be ... converted to a username (for user rights assignments) Add a module test file	2018-11-02 08:03:43 -05:00
lomeroe	271bd70cf1	capture and print exception information ... in _regexSearchKeyValueCombo use byte ']' when searching for end of policy configuration in registry.pol file (py3 fix), additionally move 2 characters from ']' location to skip ']' and the '\x00' due to the utf-16-le encoding to find the end of the element this was causing _regexSearchKeyValueCombo to return the element without the ending ']\x00' and if/when the element was replaced two ']\x00' existed at the end of the element	2018-11-02 08:03:42 -05:00
lomeroe	bc94b8e296	update method for creating size field of **delvals items for py3 ... compatibility	2018-11-02 08:03:42 -05:00
lomeroe	d9fe28a29a	fix clobbering of admx_search_results which was keeping some policies ... from being properly detected add a handful of debug statements to help with debugging admx/adml policy discovery validate text attribute exists on item before joining it with prepended text	2018-11-02 08:03:42 -05:00
Gareth J. Greenaway	c2354a9cb1	Fixing beacon state test. Adding a reset function to beacon module to clear out beacon configuration. Useful for tests runs to ensure bits are left over between runs.	2018-11-01 16:47:02 -07:00
Gareth J. Greenaway	2390f471ce	Adding SaltReturnAssertsMixin back in	2018-11-01 15:22:18 -07:00
Gareth J. Greenaway	677d0908fd	Remove zookeeper reference.	2018-11-01 15:05:42 -07:00
Gareth J. Greenaway	f3dee43bf0	Updating the beacon state module to ensure that the format of the beacon data that is being sent along to the beacon execution module is in the right format.	2018-11-01 15:02:21 -07:00
rallytime	6531af6913	Lint: Add extra blank line	2018-11-01 16:55:40 -04:00
rallytime	533cc617ad	Extend deprecation warning for enable_legacy_startup_events to Sodium ... This deprecation warning only went in recently and is new in Salt "Fluorine". We need 2 full feature releases for deprecation warnings and "Neon" would have only been 1 feature release cycle.	2018-11-01 16:46:07 -04:00
Ch3LL	4002a7c317	Fix test_issue_30161_unless_and_onlyif_together for MacOSX	2018-11-01 14:31:22 -04:00
Nicole Thomas	12de4b99d4	Merge pull request #50340 from garethgreenaway/backport_48087_to_2018_3 ... [2018.3] Backporting #48087 to 2018.3	2018-11-01 14:15:36 -04:00