89327 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gareth J. Greenaway	a9c36b08ff	Gating the cron tests for the scheduler to ensure that the croniter module is installed before we attempt to run these tests	2017-12-28 11:21:18 -08:00
Gareth J. Greenaway	2f4653e271	Adding tests for cron functionality.	2017-12-28 11:21:18 -08:00
Nicole Thomas	fc0046bf96	Merge pull request #45196 from rallytime/fix-45182 ... Don't log in the __virtual__() space in gcp_addon module	2017-12-28 14:03:06 -05:00
Nicole Thomas	4ff2d1ab18	Merge pull request #44578 from gtmanfred/ssh ... enable calling SaltSSH minions from the salt master	2017-12-28 13:02:38 -05:00
Daniel Wallace	eb2dad36dd	fix pylint	2017-12-28 07:49:06 -07:00
Daniel Wallace	262405b0e8	split out publishing to ssh minions ... and clean up docs	2017-12-28 07:49:06 -07:00
Daniel Wallace	190110be8f	switch to threading	2017-12-28 07:49:06 -07:00
Daniel Wallace	d100437639	fix pylint	2017-12-28 07:49:05 -07:00
Daniel Wallace	efe50f4b3a	Daemonize salt-ssh process	2017-12-28 07:49:05 -07:00
Daniel Wallace	3a5dc8e71b	make sure all args are strings ... when calling from `enable_ssh_minions` they could be other things.	2017-12-28 07:49:05 -07:00
Daniel Wallace	7e9f673675	make the jid in the ssh minion payload the same as the one for the tag	2017-12-28 07:49:05 -07:00
Daniel Wallace	d3a556a6f3	remove old event that never got ran	2017-12-28 07:49:05 -07:00
Daniel Wallace	7d55924cf1	this makes this all work with syndics ... Any help would be great here, for some reason the jid gets updated and changed somewhere in here, but only when using a syndic.	2017-12-28 07:49:05 -07:00
Daniel Wallace	1ec73143db	dont pass syndic job lookups to ssh	2017-12-28 07:49:05 -07:00
Daniel Wallace	b866c5f55d	fix option name	2017-12-28 07:49:05 -07:00
Daniel Wallace	78c9b32bfe	only fire events for stuff that is dictionaries	2017-12-28 07:49:05 -07:00
Daniel Wallace	38aeb7ad5f	add enable_ssh documentation	2017-12-28 07:49:05 -07:00
Daniel Wallace	24541d464d	allow calling ssh minions from salt master process	2017-12-28 07:49:04 -07:00
rallytime	add0a827f9	Don't log in the __virtual__() space in gcp_addon module ... Fixes #45182	2017-12-28 08:27:47 -05:00
Nicole Thomas	f093fe1af0	Merge pull request #45095 from terminalmage/py3-loader ... PY3: Make loader ignore .pyc files not in __pycache__	2017-12-27 18:23:35 -05:00
Nicole Thomas	8bd164c45b	Merge pull request #45184 from twangboy/win_add_libnacl_oxygen ... Add libnacl dependency	2017-12-27 17:08:46 -05:00
twangboy	afd95fa821	Add libnacl dependency	2017-12-27 13:43:23 -07:00
Nicole Thomas	a532a6b7ba	Merge pull request #44890 from terminalmage/salt.cmd-runner ... Add grains (and optionally pillar) to salt.cmd runner	2017-12-27 14:04:50 -05:00
Nicole Thomas	29eae303f7	Merge pull request #45148 from terminalmage/json.dumps ... Replace json module usage with a helper to ensure unicode content is handled properly	2017-12-27 13:51:03 -05:00
Nicole Thomas	42185b79b8	Merge branch 'oxygen' into py3-loader	2017-12-27 13:42:44 -05:00
Erik Johnson	7b13a7df8b	Replace json module usage with a helper to ensure unicode content is handled properly ... This adds wrappers for json.dump{,s} which disable `ensure_ascii` by default.	2017-12-27 09:30:58 -06:00
Nicole Thomas	66e090e75d	Merge pull request #45113 from twangboy/win_fix_fcgrain ... Fix a stack trace in grains.core	2017-12-27 09:36:49 -05:00
Nicole Thomas	0f0ddf2d31	Merge pull request #45158 from terminalmage/fix-exclude-test ... Fix integration.modules.test_state.StateModuleTest.test_exclude	2017-12-27 09:21:20 -05:00
Erik Johnson	a73c380341	Don't use include-test SLS in orch tests ... This was the _actual_ cause of the failing test in the state module integration tests.	2017-12-24 12:49:45 -06:00
Erik Johnson	4bf072435d	Fix integration.modules.test_state.StateModuleTest.test_exclude ... test_exclude shares file paths with test_include, and while I can't reproduce the failures, it is likely that improperly cleaned-up files from test_include are causing the failures in test_exclude. This is backed up by the fact that the state.sls return data from the salt-runtests.log shows no trace of the "to-include-test" file (suggesting it was excluded as expected), yet os.path.isfile() returns True for this path, causing the test to fail. This commit uses a distinct base dir for both tests, which should keep this sort of failure from happening.	2017-12-24 12:08:57 -06:00
Erik Johnson	14c8979cb6	Merge pull request #45153 from terminalmage/fix-docker-unit-test ... Update mocking in unit.grains.test_core.CoreGrainsTestCase.test_docker_virtual	2017-12-24 09:23:41 -06:00
Erik Johnson	d9a915fdc9	Update mocking in unit.grains.test_core.CoreGrainsTestCase.test_docker_virtual ... This fixes this test in Oxygen, where the function name has changed.	2017-12-23 19:47:37 -06:00
Erik Johnson	3a7825618c	Fix master-side ckminions check	2017-12-23 09:19:03 -06:00
Erik Johnson	3b4b9335c3	Clarify docstring	2017-12-23 09:19:03 -06:00
Erik Johnson	bc307964d9	Add grains (and optionally pillar) to salt.cmd runner ... Not having grains was an oversight, it causes a lot of errors in processing the __virtual__ functions. Additionally, the __pillar__ dunder did not exist, so anything that referenced it would result in a traceback.	2017-12-23 09:19:03 -06:00
Nicole Thomas	16a097635a	Merge pull request #44991 from isbm/isbm-sql-pillar-bugfix ... SQL Pillar bugfix	2017-12-22 16:54:19 -05:00
Nicole Thomas	1e1dfdadc0	Merge pull request #45144 from jasperla/joyent/keyname ... update the default configuration for joyent with a keyname	2017-12-22 16:04:26 -05:00
Jasper Lievisse Adriaanse	e1bfb804de	update the default configuration for joyent with a keyname ... this parameter is mandatory as otherwise the user is presented with a puzzling HTTP 401	2017-12-22 20:09:45 +01:00
Nicole Thomas	f39731fab0	Merge branch 'oxygen' into isbm-sql-pillar-bugfix	2017-12-22 13:45:48 -05:00
Nicole Thomas	b0a23548f3	Merge pull request #45088 from twangboy/win_custom_config ... Add `/custom-config` switch to Windows installer	2017-12-22 10:19:59 -05:00
Nicole Thomas	e643de6545	Merge pull request #43892 from terminalmage/lock-mountpoints ... Fix a race condition with git_pillar mountpoints	2017-12-22 09:38:40 -05:00
Nicole Thomas	f978bf3944	Merge pull request #45131 from rallytime/merge-oxygen ... [oxygen] Merge forward from 2017.7 to oxygen	2017-12-22 09:35:02 -05:00
rallytime	9ded5e1cbb	Merge branch '2017.7' into 'oxygen' ... Conflicts: - salt/config/__init__.py - salt/grains/core.py - salt/modules/win_lgpo.py - salt/returners/mysql.py - salt/states/libcloud_dns.py - tests/integration/runners/test_runner_returns.py - tests/unit/grains/test_core.py	2017-12-21 15:58:08 -05:00
twangboy	467013a08f	Fix punctuation and erroneous characters	2017-12-21 13:11:24 -07:00
Nicole Thomas	67df35ecd3	Merge pull request #44984 from garethgreenaway/scheduler_fixes_loop_interval ... [oxygen] scheduler loop interval fixes	2017-12-21 15:11:09 -05:00
Nicole Thomas	b49ee97938	Merge pull request #45124 from gtmanfred/2017.7 ... enable using kitchen-salt with ec2 on 2017.7	2017-12-21 14:11:27 -05:00
Daniel Wallace	d0586013eb	fix pylint	2017-12-21 10:40:54 -07:00
Gareth J. Greenaway	98a9ddf10c	Merge branch 'oxygen' into scheduler_fixes_loop_interval	2017-12-21 08:36:09 -08:00
Daniel Wallace	59e2e56d13	chmod the xml files before trying to copy	2017-12-21 08:17:10 -07:00
Nicole Thomas	7dd4255ab4	Merge pull request #45115 from twangboy/win_fix_pyzmq ... Set pyzmq version to 16.0.3	2017-12-21 09:36:16 -05:00