90477 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Bo Maryniuk	9fa6647bd0	Refactor a unit test for calling PID file removal without the exception	2018-02-12 18:54:23 +01:00
Bo Maryniuk	fe4502b0e4	Add debug logging call to the unit test check	2018-02-12 18:54:23 +01:00
Bo Maryniuk	d9941ce1f3	Throw away unnecessary variable handling	2018-02-12 18:54:23 +01:00
Bo Maryniuk	06158e4242	Remove unnecessary string on get->return	2018-02-12 18:54:23 +01:00
Bo Maryniuk	2908422539	Add debugging information to the log	2018-02-12 18:54:23 +01:00
Bo Maryniuk	56818045b6	Add unit test for calling PID deletion as non-root user	2018-02-12 18:54:23 +01:00
Bo Maryniuk	2f5b133149	Fix unit test to attempt remove PID file as root	2018-02-12 18:54:23 +01:00
Bo Maryniuk	3a8e43f806	Add tear-down method	2018-02-12 18:54:23 +01:00
Bo Maryniuk	7a0e3e983c	Use pytest	2018-02-12 18:54:23 +01:00
Bo Maryniuk	879c40b1c3	Fix logging, remove extra-parenthesis (PEP8)	2018-02-12 18:54:23 +01:00
Bo Maryniuk	f7887e5f7c	PEP8: remove extra-parenthesis	2018-02-12 18:54:23 +01:00
Bo Maryniuk	1be8f8d820	Bugfix: do not crash on import error, but log that incident instead	2018-02-12 18:54:23 +01:00
Bo Maryniuk	5b9c49d6bb	Use logger variable and fix unicode support	2018-02-12 13:36:05 +01:00
Bo Maryniuk	e83490032d	Fix unicode support for the logging	2018-02-12 13:36:05 +01:00
Bo Maryniuk	62b5a0c3ea	Use logger variable	2018-02-12 13:36:05 +01:00
Bo Maryniuk	628df440ed	Remove extra-backslashes	2018-02-12 13:36:05 +01:00
Bo Maryniuk	0c40c4a4b6	Remove extra-parenthesis and extra-backslashes	2018-02-12 13:36:05 +01:00
Bo Maryniuk	20c952a8cb	Rename logger variable	2018-02-12 13:36:05 +01:00
Bo Maryniuk	51ba019a1a	Lintfix: remove extra-parenthesis. Remove unnecessary back-slashes	2018-02-12 13:36:05 +01:00
Bo Maryniuk	4d056a0452	Suppress logging PID file removal if running on non-root.	2018-02-12 13:36:04 +01:00
Bo Maryniuk	bcde1db2fb	Add logging	2018-02-12 13:36:04 +01:00
Nicole Thomas	d3a8f06911	Merge pull request #45927 from rallytime/utils-paths ... Update old utils path to new path for which() function	2018-02-09 17:30:51 -05:00
Nicole Thomas	c0e01cea05	Merge pull request #45950 from rallytime/bp-45902 ... Back-port #45902 to oxygen.rc1	2018-02-09 17:30:17 -05:00
Nicole Thomas	977953cf9f	Merge pull request #45952 from rallytime/bp-45928 ... Back-port #45928 to oxygen.rc1	2018-02-09 17:28:54 -05:00
Nicole Thomas	c510498df2	Merge pull request #45951 from rallytime/bp-45742 ... Back-port #45742 to oxygen.rc1	2018-02-09 17:28:33 -05:00
Nicole Thomas	570bbc9cd7	Merge pull request #45931 from gtmanfred/publisher ... Fix publisher_acl for oxygen	2018-02-09 15:52:49 -05:00
Gareth J. Greenaway	cda805fc3b	Fixing vault when used with pillar over salt-ssh	2018-02-09 11:44:51 -05:00
Marc Vieira-Cardinal (VA2MVC)	3a2f1040f4	Removed the chained copy	2018-02-09 11:42:32 -05:00
Marc Vieira-Cardinal (VA2MVC)	65fa24aa26	list.copy() is not compatible with python 2.7 ... I doubt that a .copy() is required there since list() would already create one but since the previous committer added it I am improving by replacing the .copy() with a [:] which makes a copy in python 2.7 and 3+	2018-02-09 11:42:27 -05:00
Erik Johnson	0ff41c5835	Add regression test for issue 45893	2018-02-09 11:40:22 -05:00
Erik Johnson	4f522eee2f	Remove duplicated section in docstring and fix example	2018-02-09 11:40:22 -05:00
Erik Johnson	dd378bba9b	Check the effective saltenv for cached archive ... This fixes a regression caused by using a saltenv other than `base`.	2018-02-09 11:39:54 -05:00
rallytime	e04e7bdfc9	Remove extra patch	2018-02-09 09:40:22 -05:00
Nicole Thomas	e64764499a	Merge pull request #45936 from garethgreenaway/fixing_mactests_queue_full ... [oxygen] Fix to log/handlers/__init__.py	2018-02-09 07:17:18 -05:00
Nicole Thomas	f4acb18d4b	Merge pull request #45912 from gtmanfred/vmware ... add test to verify vmware clusters can be used in vmware cloud	2018-02-09 07:15:51 -05:00
Gareth J. Greenaway	2aa4483784	Adding an import for salt.ext.six.moves to import queue to use in the exception for when the multiprocessing queue is full.	2018-02-08 14:54:29 -08:00
Nicole Thomas	a356a31ab4	Merge pull request #45929 from sdodsley/purefa_doc_fix ... Documentation fix for snap_eradicate function in purefa module	2018-02-08 17:36:09 -05:00
Daniel Wallace	26b532300e	Revert "Handle deprecation path for pki_dir in verify_env util" ... This reverts commit d50b7e0062.	2018-02-08 13:05:49 -07:00
Simon Dodsley	c2f681a9c2	Fix documentation in snap_eradicate function (purefa module)	2018-02-08 14:58:40 -05:00
Daniel Wallace	dc91055059	Revert "Separates key_dir from cache_dir, The key files (i.e. '.root_key', '.sudo_...') must not be shared with other masters." ... This reverts commit 20bf4eed1d. This change breaks publisher_acls. 1) The key_dir's permissions are controlled by `permissive_pki_access` which is not required by publisher_acls. By default, it is also changed back to 700 each time that the salt-master restarts, so it will have to be chmodded each time. 2) The default directory for these keys is changed, which will break a lot of users publisher_acls setups on an upgrade to Oxygen, and require them to go back in to chmod new directories. I was going through and switching out the key dir to default back to /var/cache/salt/master, and allow it to be changed, and also be able to specify that it is a sensitive dir, but once I ran across the `permissive_pki_access` stuff, I thought it was better to just revert this change and try again against Fluorine, since we do not have a lot of tests in this area around publisher_acl.	2018-02-08 12:55:25 -07:00
Daniel Wallace	9edc0baf0c	dont touch log_file if log_level is quiet	2018-02-08 12:55:25 -07:00
rallytime	a16ea53430	Update old utils path to new path for which() function	2018-02-08 14:38:25 -05:00
Nicole Thomas	61d86588b2	Merge pull request #45918 from DSRCorporation/bugs/windows_unicode ... Windows unicode related bugfix	2018-02-08 13:45:37 -05:00
Daniel Wallace	3e093ba022	fix pylint	2018-02-08 09:37:11 -07:00
Dmitry Kuzmenko	6260cddb11	Don't use unicode for WinDLL and ctypes.LoadLibrary on Windows	2018-02-08 17:40:00 +03:00
Nicole Thomas	c88352a26f	Merge pull request #45844 from garethgreenaway/track_scheduled_next_time_skipped_jobs ... [oxygen] Track the next scheduled fire time and when jobs are skipped.	2018-02-08 09:12:23 -05:00
Nicole Thomas	7e0cd38066	Merge pull request #45892 from terminalmage/issue45473 ... Add unit tests for gitfs features new to Oxygen	2018-02-08 08:50:10 -05:00
Nicole Thomas	5fdd8dff76	Merge pull request #45909 from gtmanfred/cloud ... fix digitalocean tests	2018-02-08 08:21:47 -05:00
Daniel Wallace	56c5a333cd	add test to verify clusters ... This test just double checks that the get_mor_containers is called twice when trying to use a Cluster, and once if a datastore is specified.	2018-02-07 17:03:13 -07:00
Daniel Wallace	e892f75660	fix digital ocean tests	2018-02-07 14:04:37 -07:00