93463 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel A. Wozniak	5ff51affbd	Run cache_master test in tmp dir	2018-04-24 14:58:20 -07:00
esell	cb9e365bb9	convert unicode ssh pass to str for azure	2018-04-24 14:53:18 -06:00
Erik Johnson	71cf4584d8	Merge pull request #46963 from esell/develop ... convert azure sub id to byte string vs UTF	2018-04-24 14:30:31 -05:00
Nicole Thomas	6d323aa8f0	Merge pull request #47250 from terminalmage/issue47092 ... Fix virtual package detection	2018-04-24 15:22:23 -04:00
Nicole Thomas	5008aa8ecf	Merge pull request #47257 from jeroennijhof/develop ... Role is not a list but a dictionary	2018-04-24 15:21:54 -04:00
Jaro	fcc042aa5f	Fix beacon documentation for the new beahavior mentioned in issue #47267	2018-04-24 21:03:40 +02:00
Daniel Wallace	6754787e8e	update localemod tests	2018-04-24 13:38:46 -05:00
Daniel Wallace	9075070573	make sure not to send invalid information ... Localectl outputs n/a sometimes when stuff is not set, instead of just not outputting anything. Actually put None in the variable when parsing it, and do not add it to the localectl set command.	2018-04-24 13:36:21 -05:00
Erik Johnson	8012ad12f8	Fix false failure events sent when using syndic ... To properly report on nodegroup minions which failed to return, the master reports minions which don't match the target expression as "missing". Later, when aggregating returns and writing them to the CLI, failure events are fired for minions which were reported as missing. The problem with this approach is that the lower-level minions do not subscribe directly to the master-of-masters, and thus they are always marked as missing. To keep from falsely reporting them as missing, this commit filters out any minion IDs for which a return was received, so that we only report on minions which actually failed to return.	2018-04-24 10:31:17 -05:00
Gareth J. Greenaway	a2a8d78cb0	Fixing status beacon tests.	2018-04-24 08:00:06 -07:00
Gareth J. Greenaway	c87d6cae23	Ensure the salt_proxy is returning the correct tuple when the configuration is valid. Update various beacon unit tests to ensure they are testing the results of the validate function for a True result.	2018-04-24 08:00:06 -07:00
Nicole Thomas	428e915d6a	Merge pull request #47228 from pruiz/pruiz/zfs-dataset-present-slow-2018.3 ... Fix issue #47225: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots (2018.3 branch)	2018-04-24 09:35:20 -04:00
Nicole Thomas	34e969e5c7	Merge pull request #47254 from StackPointCloud/add-ssh-block-storage ... [salt.cloud.clouds.oneandone] Added block storage and ssh key support	2018-04-24 09:24:14 -04:00
Nicole Thomas	4de1c198c3	Merge pull request #47259 from DSRCorporation/bugs/45185_config_example_doc_fix ... Updated confusing docstring for tcp_pub/pull_port in conf examples	2018-04-24 09:20:54 -04:00
Nicole Thomas	0b836106b9	Merge pull request #47262 from garethgreenaway/slack_engine_target_fix ... [2018.3] Fixes to targeting in Slack engine	2018-04-24 09:18:35 -04:00
Cedric Bosdonnat	09e1d7fab4	Merge branch 'develop' into libvirt_engine_autoconnect	2018-04-24 08:52:39 +02:00
Gareth J. Greenaway	bcdef641e8	Removing target and tgt_type from the cmdline that is passed along to Salt, the target is used else where and including it in the cmdline causes problem when it is passed along. Adding an additional test to ensure we are getting the right targt.	2018-04-23 20:14:51 -07:00
Dmitry Kuzmenko	6bcafcf30a	Updated confusing docstring for tcp_pub/pull_port in conf examples	2018-04-24 02:00:17 +03:00
Jeroen Nijhof	e971f488fd	Role is not a list but a dictionary	2018-04-24 00:44:00 +02:00
Lee Clemens	fecf6d46b4	Add functionality and tests for managing selinux port policy	2018-04-23 17:33:17 -04:00
Amel Ajdinovic	615866032b	Added create block storage support. ... Added ssh key support. Added documentation	2018-04-23 23:16:36 +02:00
Nicole Thomas	15895c4ff8	Merge pull request #47214 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-04-23 17:05:29 -04:00
Mike Place	0b455b2eaf	Merge pull request #47140 from basepi/fixup ... [Bugfix] Add proper (and explicit) ordering to s3fs	2018-04-23 13:56:50 -06:00
Mike Place	55926fae64	Merge branch 'develop' into fixup	2018-04-23 13:56:41 -06:00
Mike Place	2ed4b38b02	Merge pull request #47142 from garethgreenaway/47047_passing_pillar_to_slack_aliases ... [2018.3] pillar and output formatting fixes to Slack engine	2018-04-23 13:55:06 -06:00
Erik Johnson	b8630a70be	Fix virtual package detection ... Virtual package detection was broken in #44455. This restores it for the remainder of the 2018.3 release cycle, at which time it will be removed altogether.	2018-04-23 14:31:21 -05:00
Pablo Ruiz	cfbf136ab2	Fix issue #47225: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots	2018-04-23 20:47:39 +02:00
Nicole Thomas	51fcd3bad5	Merge pull request #47133 from nocturo/bugfix-serializers ... Pass custom serializer options to merge_if_exists	2018-04-23 14:35:59 -04:00
Daniel Wallace	7148f38586	forward merge #46520 to develop ... Closes #46969	2018-04-23 12:37:50 -05:00
Mike Place	2dd802c054	Merge pull request #47210 from rallytime/stale-config-update ... Reduce the number of days an issue is stale by 10	2018-04-23 11:37:46 -06:00
rallytime	3574c707c3	Remove tests that were rewritten ... The file.patch integration tests were rewritten in the develop branch in PR #47010 They came back in during the merge-forward and should have been removed again during the merge conflict resolution.	2018-04-23 13:17:59 -04:00
Nicole Thomas	42a0e655dc	Merge pull request #47245 from terminalmage/zeromq-bytes ... Ensure we pass hexid as bytes when zmq_filtering enabled	2018-04-23 12:54:57 -04:00
Mike Place	0125f1b84b	Merge pull request #47232 from brejoc/develop-salt-ext-ipaddress ... Fixed usage of ipaddress	2018-04-23 10:50:57 -06:00
Nicole Thomas	706b9b7d84	Merge pull request #47187 from azelezni/add-thorium-gitfs-support ... Add gitfs support for Thorium	2018-04-23 12:41:58 -04:00
Nicole Thomas	73525d1460	Merge pull request #47242 from aesposito91/2018.3 ... PY3 fix for zeromq setsockopt	2018-04-23 12:38:09 -04:00
Nicole Thomas	b78295aee9	Merge pull request #47241 from cloudflare/fix-47117 ... Fix the imports into the netacl execution and state modules	2018-04-23 10:56:31 -04:00
Nicole Thomas	132e1c276f	Merge branch 'develop' into bugfix-serializers	2018-04-23 10:14:56 -04:00
Nicole Thomas	88557ea991	Merge pull request #47219 from garethgreenaway/vault_backward_compatibility ... [2018.3] Fixing a backward compatibility issue with vault module & runner	2018-04-23 10:10:18 -04:00
Nicole Thomas	370feadbd2	Merge pull request #47186 from dmurphy18/zfs_backport_46933 ... backport of issue 46933, updated ZFS handling to Salt 2018.3.x	2018-04-23 10:07:05 -04:00
Nicole Thomas	ebd8cbe6fd	Merge pull request #47226 from pruiz/pruiz/zfs-dataset-present-slow ... Fix issue #47225: avoid zfs.filesystem_present slowdown when dataset has lots of snapshots	2018-04-23 10:05:02 -04:00
rallytime	fdb1d2ddb1	Lint: Fix problems caused by bad merge conflict resolution	2018-04-23 10:02:12 -04:00
Erik Johnson	a7accc0548	Ensure we pass hexid as bytes when zmq_filtering enabled ... When using hashlib and running `.hexdigest()`, a `str` type is returned. It needs to be converted to a bytes type for the setsockopt a few lines below, if zmq_filtering is enabled and the master is running Python 3.	2018-04-23 08:47:59 -05:00
Nicole Thomas	bf3a67d11b	Merge pull request #47217 from twangboy/fix_setup ... Remove installation of pywin32 from setup.py	2018-04-23 09:32:53 -04:00
Cédric Bosdonnat	626644a9e8	virt module: fix doc typo	2018-04-23 15:21:21 +02:00
Cédric Bosdonnat	36b1d191e8	virt module: allow per call connection setup ... Allow the user to provide connection, username and password as function parameters to override the virt:connection and virt:auth configuration. This way the configuration will be a default for the minion, but other connections will still be reachable (issue 47156). As an example, the configured connection could be the qemu:///system one (would be found automatically anyway), and the user will be able to handle her containers with calls like: salt 'host' virt.list_domains connection=lxc:///	2018-04-23 15:21:20 +02:00
Cédric Bosdonnat	3d3ed786cd	virt module: actually deprecate virt.nic option ... virt.nic is considered as the old version of virt:nic in the code, but there is no warning of this. The documentation is also still mentioning virt.nic. Updating it all to move to virt:nic	2018-04-23 15:21:19 +02:00
Cédric Bosdonnat	6858c9931a	virt module: move virt.images to virt:images ... To continue the virt module options harmonization, deprecate virt.images in favor of virt:images and add documentation on this option.	2018-04-23 15:21:17 +02:00
Cédric Bosdonnat	20048c6fca	virt module: convert virt.tunnel into virt:tunnel ... To continue the virt module options harmonization, deprecate virt.tunnel in favor of virt:tunnel and add documentation on this option.	2018-04-23 15:21:16 +02:00
Cédric Bosdonnat	dbed81e1eb	Read values from config.DEFAULTS in config.get ... config.option reads values from DEFAULTS, while config.get doesn't. Adding DEFAULTS as the last fallback in config.get in case nothing else matched.	2018-04-23 15:21:15 +02:00
Cédric Bosdonnat	4673b767ca	virt module: change libvirt:storagepool to virt:storagepool ... In order to simplify the virt module configuration, continue moving all configuration options to a virt tree.	2018-04-23 15:21:13 +02:00