88117 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gareth J. Greenaway	a28e39ef31	Merging changes from #44630 for updates to scheduler to deal with loop_interval.	2017-11-30 22:02:07 -08:00
Gareth J. Greenaway	e4f5b3026a	Adding ability to postpone jobs usiing a simple, initial postpone function. The postpone function adds the current job time to a skip_explicit list and adds the new run time to a run_explicit list.	2017-11-30 22:02:07 -08:00
Gareth J. Greenaway	be192ff7fc	Renaming not_during_range to skip_during_range, adding now as a parameter for eval to override the current time. Adding skip_explicit to include an explicity list of times in unix time stamp format when jobs should be skipped. Adding ability to include a function that should be run if jobs are to be skipped.	2017-11-30 22:02:07 -08:00
Gareth J. Greenaway	52c2366c23	addding not_during_range to schedule	2017-11-30 22:02:06 -08:00
Nicole Thomas	5c737100c4	Merge pull request #44726 from terminalmage/issue42188 ... Add __context__ to RunnerClient and WheelClient	2017-11-30 19:03:02 -05:00
Mike Place	a1cdf9ab55	Merge pull request #44756 from thatch45/mstats ... Master Stats	2017-11-30 16:02:27 -07:00
Nicole Thomas	d0dad1d855	Merge pull request #44757 from terminalmage/verify_env ... Fix calls to verify_env	2017-11-30 17:08:00 -05:00
Nicole Thomas	2503a6f150	Merge branch 'develop' into verify_env	2017-11-30 14:53:35 -05:00
Thomas S Hatch	0ab85361c0	Merge branch 'mstats' of github.com:thatch45/salt into mstats	2017-11-30 11:41:49 -07:00
Thomas S Hatch	52ab561c4c	Add some extra docs	2017-11-30 11:40:40 -07:00
Thomas S Hatch	bff22e5b0b	fix soem bugs and make a better event tag	2017-11-30 11:35:33 -07:00
Mike Place	76beabb9f2	Merge pull request #44765 from mstarostik/develop ... Allow for omission of HWADDR from ifcfg-* file	2017-11-30 09:52:00 -07:00
Nicole Thomas	2c313668cd	Merge branch 'develop' into mstats	2017-11-30 09:36:18 -05:00
Malte Starostik	0acc850991	Allow for omission of HWADDR from ifcfg-* file ... Allow - addr: none in network.managed to omit the HWADDR from the generated ifcfg-* file. This allows to manage interfaces solely by their name, keeping their configuration over MAC changes. For the sake of completeness, also accept - addr: auto to explicitly request the default behaviour with no "addr" specified.	2017-11-30 14:08:50 +01:00
Erik Johnson	7049089762	Fix calls to verify_env ... https://github.com/saltstack/salt/pull/44584 deprecated pki_dir but left several references. These lines can be safely removed since sensitive_dirs is already being used in each of these refs.	2017-11-29 19:45:19 -06:00
Thomas S Hatch	4a808827c8	Add a default config entry to the master config	2017-11-29 17:14:17 -07:00
Thomas S Hatch	3ef6beeb66	clean up and add basic config	2017-11-29 17:11:23 -07:00
Erik Johnson	74a18f387f	Update orchestration unit tests	2017-11-29 15:51:53 -06:00
Nicole Thomas	63e4b6970c	Merge pull request #44715 from spenceation/panos-2017-11-28 ... Added new functions PANOS functions.	2017-11-29 14:20:17 -05:00
Erik Johnson	943a524e77	Add wheel/runner return to changes dict for orchestration	2017-11-29 10:31:06 -06:00
Erik Johnson	0e37ad39c3	Add retcode documentation to orchestrate docs	2017-11-29 10:20:22 -06:00
Erik Johnson	ecdd273231	Add info about runner/wheel retcodes to Oxygen release notes	2017-11-29 09:47:56 -06:00
Nicole Thomas	1855f3fe12	Merge pull request #43783 from garethgreenaway/43647_fix_InitiatorName_in_comments ... [develop] Fix to grains/core.py	2017-11-29 09:05:59 -05:00
spenceation	443f58f2a1	Fixed LINT issues.	2017-11-29 08:33:58 -05:00
Nicole Thomas	061ac1b3ab	Merge pull request #44612 from zachmoody/netbox-module ... Add NetBox execution module	2017-11-29 00:01:41 -05:00
Erik Johnson	18905cf32b	Add integration test for triggering orchestration failure via context	2017-11-28 22:03:11 -06:00
Erik Johnson	5e8eff9ff1	Add __context__ to runner/wheel loader instances ... This allows us to use __context__ to set a retcode, which the client can use to set the 'success' value.	2017-11-28 21:57:37 -06:00
Gareth J. Greenaway	73bae346cd	Swapping logic in _windows_iqn back to previous method to ensure tests pass.	2017-11-28 18:39:12 -08:00
Thomas S Hatch	4bde80b907	fix ref to the event bus	2017-11-28 16:49:55 -07:00
Thomas S Hatch	8446138b4c	Add prototype of master stats	2017-11-28 16:47:54 -07:00
Gareth J. Greenaway	89b546c075	Merge branch 'develop' into netbox-module	2017-11-28 15:25:42 -08:00
Gareth J. Greenaway	5d387d55fc	Merge branch 'develop' into 43647_fix_InitiatorName_in_comments	2017-11-28 13:37:00 -08:00
Gareth J. Greenaway	6ee18e4f38	Merge branch 'develop' into 43647_fix_InitiatorName_in_comments	2017-11-28 13:35:11 -08:00
spenceation	678da78a61	Added new functions: ... - get_dos_blocks - get_local_admins - test_fib_route - test_security_policy	2017-11-28 13:47:17 -05:00
Nicole Thomas	669f037761	Merge pull request #44703 from terminalmage/fix-ssh-test ... Fix ssh state.show_top integration test (develop branch)	2017-11-28 12:41:34 -05:00
Nicole Thomas	7b27873614	Merge pull request #44704 from terminalmage/salt-jenkins-556 ... Fix failing grains test on CentOS	2017-11-28 10:14:30 -05:00
Nicole Thomas	45ad24524d	Merge pull request #44705 from samodid/44651 ... Update salt-cloud lxc driver behavior when target unavailable , fix #44651	2017-11-28 10:12:23 -05:00
Erik Johnson	218d71f68a	Merge pull request #44622 from terminalmage/fix-new-grains ... Fix traceback in new iSCSI IQN grains	2017-11-28 08:38:26 -06:00
Nicole Thomas	a5828d6ad9	Merge branch 'develop' into 43647_fix_InitiatorName_in_comments	2017-11-28 09:17:34 -05:00
Volodymyr Samodid	ba1424ec6f	fix #44651 ... **now salt-cloud lxc driver won't exit if provider target unavalible	2017-11-28 08:12:59 +02:00
Erik Johnson	543d3ef62c	Merge pull request #44700 from eradman/cron_test ... Fix invocation of cron.file with when run with test=True	2017-11-27 22:19:02 -06:00
Erik Johnson	682fc1b884	Fix failing grains test on CentOS ... Resolves https://github.com/saltstack/salt-jenkins/issues/556	2017-11-27 21:37:46 -06:00
Zach Moody	1faa685d9e	fixup pylint import error.	2017-11-27 19:05:51 -06:00
Zach Moody	871a90cbc5	add netbox execution module	2017-11-27 18:59:06 -06:00
Erik Johnson	1f893d1e95	Fix ssh state.show_top integration test ... 63823f3 changed how we handle cases where master_tops and top file matches both exist in a given environment. This updates the test to reflect the correct behavior in develop based on the fact that the master_tops_first config option is set to False. See: https://github.com/saltstack/salt/pull/44697#issuecomment-347373412 and the subsequent comments in that pull request.	2017-11-27 18:50:10 -06:00
Eric Radman	c729eef9e8	Fix invocation of cron.file with when run with test=True	2017-11-27 18:21:03 -05:00
Nicole Thomas	b29300ef68	Merge pull request #44667 from oarmstrong/develop ... Fix acme.cert to run certbot non-interactively	2017-11-27 17:18:27 -05:00
Nicole Thomas	7adc0b5b6f	Merge pull request #43893 from olivier-mauras/saltclass ... SaltClass: Correct when dict is NoneType because of the value doesn't exist	2017-11-27 16:24:25 -05:00
Nicole Thomas	94001ffc64	lint: whitespace fixes	2017-11-27 16:15:44 -05:00
Nicole Thomas	e8298d734d	Merge branch 'develop' into 43647_fix_InitiatorName_in_comments	2017-11-27 15:08:36 -05:00