Commit Graph

62397 Commits

Author SHA1 Message Date
Seth House
eb3574adae Don't fail hard if the user's permissions cannot be found
Salt enforces authorization not salt-api. Showing the user his/her
permissions is a nicety only. We should make a best effort to retrieve
them but if we cannot we should log the user in instead of blocking.
2016-08-17 18:56:03 -06:00
Seth House
ec597bd54c Change groups check in token to look for truthy values
The 'groups' value in the token payload can be missing, can be False,
can be None, or can be an array.
2016-08-17 18:38:09 -06:00
Thomas S Hatch
c3319b2a8b Merge pull request #35476 from cachedout/issue_35380
Fixup SSH bug where sudo without sudo user would break
2016-08-16 09:41:25 -06:00
Mike Place
c05fcf33d1 Fixup SSH bug where sudo without sudo user would break
Fixes #35380
2016-08-16 12:28:18 +09:00
Mike Place
004778c966 Merge pull request #35471 from terminalmage/issue34479
win_pkg: Fix traceback when package is not installed
2016-08-16 11:02:00 +09:00
Mike Place
5c9428c32d Merge pull request #35448 from isbm/isbm-zypper-106-fix
Add ignore_repo_failure option to suppress zypper's exit code 106 on …
2016-08-16 10:39:43 +09:00
Mike Place
1473474b04 Merge pull request #35451 from isbm/isbm-zypper-mod_repo-unchanged
Bugfix: zypper mod repo unchanged
2016-08-16 10:38:25 +09:00
Mike Place
a8c4f17f50 Merge pull request #35453 from theothergraham/fix_CacheDisk
fixes #34279 - disk cache ttl expiry
2016-08-16 10:34:33 +09:00
Mike Place
d8c35b5260 Merge pull request #35459 from thatch45/shim_fix
Ensure that output for salt-ssh gets back
2016-08-16 10:29:16 +09:00
Erik Johnson
e243c63e43 win_pkg: Fix traceback when package is not installed 2016-08-15 19:14:49 -05:00
Graham McCullough
ae5b233d51 fixes #34279 2016-08-15 14:34:20 -07:00
Nicole Thomas
38b60a32e5 [2015.8] Update bootstrap script to latest stable (2016.08.15) (#35460) 2016-08-15 13:23:24 -06:00
Thomas S Hatch
10037b00cb Some environments refuse to return the command output
This results in the output from salt-ssh being empty,
this fix ensures that the output is always there
2016-08-15 12:57:58 -06:00
Mike Place
d75005c519 Fix cp.push_dir pushing empty dirs (#35442)
Fixes #35010
2016-08-15 11:00:54 -06:00
Mike Place
09925ba353 Minor doc fixup (#35436)
* Minor doc fixup

Refs #35387

* Include reload_grains
2016-08-15 09:53:56 -06:00
Bo Maryniuk
8790197d86 Fix Unit test for suppressing the exception removal on non-modified repos 2016-08-15 17:35:25 +02:00
Bo Maryniuk
3f00c6997a Remove zypper's raise exception if mod_repo has no arguments and/or no changes 2016-08-15 17:35:01 +02:00
Bo Maryniuk
dd82e6a848 Add ignore_repo_failure option to suppress zypper's exit code 106 on unavailable repos 2016-08-15 15:03:53 +02:00
Mike Place
a0b128a85a Merge pull request #35132 from sjorge/2015.8-35121
fixes , causing lots of mayham (onchange) with 2016.3.2 for me
2016-08-15 16:11:22 +09:00
Nicole Thomas
d9c20c0456 Update freebsd.rst (#35394)
Updated FreeBSD installation instructions to remove ``priority`` definition. 
(This, I believe, should address an issue submitted in saltstack/salt-bootstrap/issues/908)
2016-08-11 11:00:36 -06:00
Erik Johnson
a375dd7e1f Clean up open filehandles (#35359)
* salt/crypt.py: clean up open filehandles

* salt/fileclient.py: clean up open filehandles

* salt/grains/core.py: clean up open filehandles

* salt/modules/cp.py: clean up open filehandles

* salt/modules/data.py: clean up open filehandles

* salt/modules/dnsutil.py: clean up open filehandles

* salt/modules/dockerng.py: clean up open filehandles

* salt/modules/inspectlib/collector.py: clean up open filehandles

* salt/modules/file.py: clean up open filehandles

* salt/modules/hosts.py: clean up open filehandles

* salt/modules/incron.py: clean up open filehandles

* salt/modules/dpkg.py: clean up open filehandles

* salt/modules/linux_sysctl.py: clean up open filehandles

* salt/modules/netbsd_sysctl.py: clean up open filehandles

* salt/modules/network.py: clean up open filehandles

* salt/modules/nftables.py: clean up open filehandles

* salt/modules/openbsd_sysctl.py: clean up open filehandles

* salt/modules/rh_ip.py: clean up open filehandles

* salt/modules/portage_config.py: clean up open filehandles

* salt/modules/status.py: clean up open filehandles

* salt/modules/tls.py: clean up open filehandles

* salt/modules/xapi.py: clean up open filehandles

* salt/modules/x509.py: clean up open filehandles

* salt/modules/virt.py: clean up open filehandles

* salt/modules/zcbuildout.py: clean up open filehandles

* salt/returners/local_cache.py: clean up open filehandles

* salt/utils/cloud.py: clean up open filehandles

* salt/states/pkgrepo.py: clean up open filehandles

* salt/states/x509.py: clean up open filehandles

* salt/transport/mixins/auth.py: clean up open filehandles

* salt/utils/__init__.py: clean up open filehandles

* salt/states/pkg.py: clean up open filehandles

* salt/utils/minion.py: clean up open filehandles

* salt/utils/openstack/nova.py: clean up open filehandles

* salt/utils/openstack/swift.py: clean up open filehandles

* salt/utils/process.py: clean up open filehandles

* salt/utils/templates.py: clean up open filehandles

* salt/utils/virt.py: clean up open filehandles

* tests/integration/__init__.py: clean up open filehandles

* tests/integration/cli/grains.py: clean up open filehandles

* tests/integration/client/standard.py: clean up open filehandles

* tests/integration/modules/hosts.py: clean up open filehandles

* tests/unit/utils/vt_test.py: clean up open filehandles

* tests/integration/shell/enabled.py: clean up open filehandles

* tests/integration/states/cmd.py: clean up open filehandles

* tests/integration/states/file.py: clean up open filehandles

* tests/integration/states/match.py: clean up open filehandles

* tests/unit/config_test.py: clean up open filehandles

* tests/unit/templates/jinja_test.py: clean up open filehandles

* tests/unit/utils/find_test.py: clean up open filehandles

* tests/integration/modules/state.py: clean up open filehandles

* Update dnsutil_test to reflect changes in fopen usage
2016-08-11 10:45:24 -06:00
Thomas S Hatch
9ea7a34c30 Merge pull request #35339 from isbm/isbm-2015.8-minion-importerror-fix
Bugfix: Prevent continuous restart, if a dependency wasn't installed
2016-08-11 10:15:16 -06:00
Bo Maryniuk
12af60b7be Fix continuous minion restart if a dependency wasn't installed 2016-08-11 12:18:19 +02:00
Mike Place
fd9b05ace4 Merge pull request #35357 from twangboy/file.recurse.clean.2015.8
Fix file.recurse with clean: True  on Windows (2015.8)
2016-08-11 09:44:14 +09:00
twangboy
d328ec0157 Fix file.recurse with clean: True 2016-08-10 19:01:05 +00:00
Mike Place
4618b433e9 Merge pull request #35323 from thatch45/ssh_crazy
Fix issue with bad error check in salt-vt
2016-08-10 20:33:49 +09:00
Mike Place
cfae862972 Merge pull request #35325 from kev009/fbsd-netstat-route
Fix freebsd netstat route on fbsd 10+
2016-08-10 20:33:12 +09:00
Kevin Bowling
0d49dd3c29 Fix fbsd netstat route on fbsd 10+ 2016-08-09 18:41:34 -07:00
Thomas S Hatch
8a5b47b5d7 Collect all error data from the wfuncs call 2016-08-09 17:39:14 -06:00
Thomas S Hatch
11864c31b7 supress a stack trace to show clean ssh error 2016-08-09 17:24:56 -06:00
Thomas S Hatch
9fbfa282fa wow this solves an issue! 2016-08-09 17:05:22 -06:00
Ivan Babrou
244c3bd495 Pass port to ssh.check_known_host, closes #35264 (#35301) 2016-08-09 13:16:01 -06:00
Erik Johnson
243909f39d file.recurse: Do not convert octal mode string to int (#35309)
* Add integration test for #34945

* file.recurse: Do not convert octal mode string to int

When we run file.makedirs_perms to create the dest directory, we pass
through the mode to file.check_perms. However, file.check_perms expects
an octal string, not an int. This causes the initial directory to be
chmod'ed to the wrong mode. When there are files in the source
directory, file.recurse will invoke the file.directory state to manage
files/dirs in that directory, and this ends up correcting the mode as we
simply pass the dir_mode to it. However, when there are only directories
in the source directory, this never happens and the incorrect mode
remains on the destination directory.

Fixes #34945.
2016-08-09 13:02:26 -06:00
Mike Place
2efc1b333b Merge pull request #35290 from terminalmage/issue35051
Resolve a couple bugs in orchestration output
2016-08-10 00:27:00 +09:00
Erik Johnson
d621aa7b61 Update runner/wheel unit tests to reflect new key in ret dict 2016-08-09 08:49:52 -05:00
Erik Johnson
90c12a9c7b Add __orchestration__ key to orch returns for runner/wheel funcs
This gets passed through to the highstate outputter to suppress the
error in the output when the changes param is not a dict.
2016-08-09 08:49:52 -05:00
Erik Johnson
7b8c3b86e7 Suppress error about invalid changes data for orchestration jobs 2016-08-09 08:49:52 -05:00
Erik Johnson
54a1704d6c Suppress event for wheel/runner funcs executed from orchestration 2016-08-09 08:49:52 -05:00
Erik Johnson
f409f62bf2 Accept print_event option in WheelClient.cmd() 2016-08-09 08:49:52 -05:00
Erik Johnson
b42b25ccce Add cmd func for RunnerClient 2016-08-09 08:49:52 -05:00
Erik Johnson
480065fe00 Add print_event option to client mixins
This allows the printing of namespaced events to be suppressed, for
instance in cases where we are running orchestration and don't want the
return data from a runner/wheel function to be printed to the console.
2016-08-09 08:49:52 -05:00
Thomas S Hatch
f8158124d5 Merge pull request #35211 from cachedout/issue_31074
Alternative sudo users for salt-ssh
2016-08-08 09:40:55 -06:00
Mike Place
3e4eb13daa Merge pull request #35271 from bobrik/default-output-profile
Default state_output_profile to True everywhere, closes #35166
2016-08-08 23:36:23 +09:00
Ivan Babrou
6cdee21036
Default state_output_profile to True everywhere, closes #35166 2016-08-08 13:38:39 +01:00
Mike Place
673e1aa1aa Merge pull request #35233 from terminalmage/issue32719
Do not attempt to get fqdn_ip{4,6} grains when ipv{4,6} grains are empty
2016-08-07 07:58:32 +09:00
Mike Place
cdf3c0fe73 Merge pull request #35202 from multani/fix/test-doc
doc: fix broken links in the test documentation page
2016-08-06 17:29:40 +09:00
Mike Place
e1331cd2a3 Merge pull request #35236 from rallytime/bp-35119
Back-port #35119 to 2015.8
2016-08-06 17:10:53 +09:00
Mike Place
4f2b8aa5b6 Merge pull request #35240 from derekmaciel/bp-35225
Backport #35225 to 2015.8
2016-08-06 16:54:19 +09:00
Mike Place
4bcfaa97d0 Merge pull request #35241 from terminalmage/gitfs-fixes
Ensure max recursion in gitfs results in no blob object being returned.
2016-08-06 16:53:49 +09:00
Mike Place
f6d7360e0b Merge pull request #35245 from rallytime/bp-35039
Back-port #35039 to 2015.8
2016-08-06 16:52:44 +09:00