Commit Graph

62416 Commits

Author SHA1 Message Date
Mike Place
9f87081cef Merge pull request #35302 from Ch3LL/add_job_cache_test
Add job cache test
2016-08-17 19:45:28 +09:00
Mike Place
1c82c6bee5 Merge pull request #35512 from cachedout/fixup_35419
Fixup 35419
2016-08-17 19:11:17 +09:00
Mike Place
253662541a Fix import 2016-08-17 19:10:29 +09:00
Mike Place
e1a373fa4c Merge pull request #35497 from deepakhj/2015.8
Fixes spacing in requirements files
2016-08-17 18:34:15 +09:00
Erik Johnson
4048255ed6 Merge pull request #35508 from terminalmage/update-docstring
Add Carbon to versionadded for git.diff
2016-08-17 01:17:12 -05:00
Erik Johnson
67c945fce0 Add Carbon to versionadded for git.diff 2016-08-17 01:15:40 -05:00
Ch3LL
ccb2a5cadf remove unused imports 2016-08-16 15:21:20 -06:00
Ch3LL
512ae81dfd remove TMP and add integration.TMP 2016-08-16 15:18:24 -06:00
Deepak Jagannath
685db4ab88 Fix spacing 2016-08-16 13:16:59 -07:00
Nicole Thomas
bfe7107a87 Update bootstrap script to latest stable (2016.08.16) (#35486) 2016-08-16 10:58:23 -06:00
Thomas S Hatch
240fc12863 Merge pull request #35413 from cachedout/issue_35296
Resolve path issues with cp.push
2016-08-16 10:40:39 -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
fb8a12d677 Fix silly error 2016-08-16 11:05: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
Tim Egbert
f16a30786b Fixes consul.agent_service_register which was broken for registering
service checks.

The function "agent_service_register" in the consul.py module failed
to register service health checks and did not follow the consul.io
documentation for doing so. This patch fixes the code to successfully
register service checks, check for dict keys case-insensitive (because
the absense of keys with the correct case would fail silently), and
more closely follow the documentation at consul.io, see:

https://www.consul.io/docs/agent/http/agent.html#agent_service_register

Here is an example salt state for registering a service and a couple
of health checks, similar to the example in the consul.io documents:

example-service-registration:
  module.run:
    - name: consul.agent_service_register
    - consul_url: "http://localhost:8500"
    - kwargs:
        id: redis1
        name: "redis"
        tags: [master, v1]
        address: "127.0.0.1"
        port: 8000
        EnableTagOverride: false
        check:
          script: "/usr/local/bin/check_redis.py"
          http: "http://localhost:5000/health"
          interval: "15s"

NOTE: the saltstack documentation needs to be updated. It wasn't
correct anyway.
2016-08-12 11:07:16 -06:00
Mike Place
3646cf1afa Additional checks on master and integration test 2016-08-12 20:06:20 +09:00
Mike Place
09efde7634 Splat the list into os.path.join 2016-08-12 19:08:43 +09:00
Mike Place
fc0d5878bc Set file_recv on test master 2016-08-12 19:08:27 +09:00
Mike Place
81c4d136c5 Transition file push paths to lists
To support multiple platforms, it will be difficult to try to account
for various path seperators and drive lettering schemes on the receiving
end of a file push. Instead, transition to an interface wherein the file
path is first split and seperators removed prior to it being sent from
the minion to the master.
2016-08-12 18:33:20 +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
Ch3LL
c9b7c3cf80 need to add returners option in other places 2016-08-09 13:53:42 -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
Ch3LL
7316df7a02 fix pylint 2016-08-09 10:35:01 -06:00