valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
69,427 Commits 24 Branches 182 Tags 341 MiB
f205d5f870
Commit Graph

69427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
a8a72c985f Merge pull request #36297 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-14 10:07:30 -06:00
Mike Place
ee997be6d8 Fix pkg group test by passing a list instead of str 
Refs  integration.states.pkg.PkgTest.test_group_installed_handle_missing_package_group
 2016-09-14 09:53:10 -06:00
rallytime
c7d8867096 Gate the pkg.group_installed state test: not all pkg modules have group_install 
Refs #35907
 2016-09-14 09:25:56 -06:00
Mike Place
7684ebd0e7 Filter out pub kwargs from cloud runner (#36178) 
* Filter out pub kwargs from cloud runner

* Fix typo

* Proper function unpacking
 2016-09-14 09:18:09 -06:00
rallytime
e2f1cf6025 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-14 09:10:05 -06:00
Mike Place
fc7a1d536f Merge pull request #36238 from pass-by-value/vmware_clone_from_snapshot 
Add ability to clone from a snapshot to salt-cloud vmware driver
 2016-09-14 14:31:50 +09:00
Mike Place
b9b8e45362 Merge pull request #36272 from terminalmage/improved-gitfs-logging 
Improved gitfs/git_pillar error logging
 2016-09-14 14:25:16 +09:00
Mike Place
abb6aacb4b Merge pull request #36277 from terminalmage/gitfs-check-key-path 
salt.utils.gitfs: Check for existence of ssh keys
 2016-09-14 14:22:37 +09:00
Erik Johnson
223a20e987 Improved gitfs/git_pillar error logging 
This adds ``exc_info_on_loglevel`` kwargs to error logging when the
error is being logged within an ``except`` block, to aid in
troubleshooting.
 2016-09-13 16:51:20 -05:00
Pablo Suárez Hernández
ed2d2bd331 Integration tests fixes for 2015.8 (#36262) 
* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
 2016-09-13 15:24:06 -06:00
Erik Johnson
4fee18c820 salt.utils.gitfs: Check for existence of ssh keys 
This adds a check for existence of the public and private keys, and
will raise an exception if they do not exist.

The git_pillar preflight checks have also been altered to try to init
the git_pillar repos, instead of just instantiating a GitPillar object.
This will cause invalid git_pillar configuration to keep the master from
starting up like we already do for gitfs.
 2016-09-13 14:52:52 -05:00
Pablo Suárez Hernández
a0bbb0f648 Integration tests fixes for 2016.3 (#36263) 
* Fix PillarModuleTest::test_pillar_items: 'info' does not exist in pillar

* Fixing integration tests if azure is not present

* Fixing integration tests failures if 'git' command is missing

Skip git state integration tests if 'git' does not exists
Prevent OSError if 'git' command not found during _git_version()
 2016-09-13 12:40:56 -06:00
Erik Johnson
297a12c387 Fix misspelling of "occurred" in log messages/exceptions (#36270) 2016-09-13 12:33:41 -06:00
Nicole Thomas
d634fd8628 Merge pull request #36264 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-13 12:25:41 -06:00
Aditya Kulkarni
dd670bd18f Fix lint error and add try except 2016-09-13 10:30:28 -04:00
rallytime
f603757b55 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - tests/unit/modules/mount_test.py
  - tests/unit/states/file_test.py
 2016-09-13 08:21:48 -06:00
Mike Place
de06116075 Merge pull request #35688 from cachedout/issue_33525 
Splat serializer default configs into the serializer kwargs
 2016-09-13 18:21:46 +09:00
Mike Place
4910e8191c Provide fallback for serializers without opts 2016-09-13 17:03:11 +09:00
Mike Place
d9d477ed45 Merge pull request #36025 from cloudflare/CF-FIX-36021 
Potential fix for #36021
 2016-09-13 16:46:41 +09:00
Mike Place
931486ba35 Merge pull request #36096 from twangboy/update_setup 
[WIP] Add additional required dll's for Windows
 2016-09-13 16:45:33 +09:00
Mike Place
b0dd6ff5c8 Merge pull request #36244 from terminalmage/gen-back-bug 
salt.fileserver.Fileserver: Don't try to split a list in _gen_back
 2016-09-13 09:53:16 +09:00
Mike Place
dcc9380996 Merge pull request #36245 from terminalmage/roots-bug 
roots backend: Don't include '.' or '..' in empty_dirs
 2016-09-13 09:52:14 +09:00
Erik Johnson
75d4997b70 roots backend: Don't include '.' or '..' in empty_dirs 2016-09-12 16:09:46 -05:00
Erik Johnson
363b21fd9b salt.fileserver.Fileserver: Don't try to split a list in _gen_back 
This fixes a bug which causes backends passed as a python list to be
converted to a ``str`` (specifically a ``unicode`` type in PY2) and then
split, resulting in a backend that will never match anything.

This only affects runner and Salt Python API usage in which the
"backend" param to fileserver runner funcs is passed as a Python list.
 2016-09-12 15:43:39 -05:00
Aditya Kulkarni
d96981639b Add ability to clone from a snapshot to salt-cloud vmware driver 2016-09-12 14:49:20 -04:00
Pablo Suárez Hernández
fdf40907b7 Some unit tests fixes (#36227) 
* Prevent tests failures if boto does not exists

* Prevent tests failure if /etc/fstab does not exists
 2016-09-12 11:43:12 -06:00
Daniel Hobley
449c29897c Fix timezones states on OS X (#36183) 
* Fix timezones states on OS X

- This function was missing but required by the timezone states

* Added stand in functions for hwclock on OS X

- This fixes the timezone states which tries to use these functions
 2016-09-12 11:42:26 -06:00
Nicole Thomas
fcbebb40c3 Merge pull request #36235 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-12 11:40:42 -06:00
Erik Johnson
7b96197c5e Merge pull request #36137 from cachedout/issue_35423 
Allow highstate outputter to show all results
 2016-09-12 11:37:49 -05:00
rallytime
99dcf84b62 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-12 10:09:43 -06:00
Mike Place
1b12940a1f Docs clarification for module sync and state.apply (#36217) 
Closes #35340
 2016-09-12 08:42:12 -06:00
Mike Place
6ebe655e17 Merge pull request #36184 from DSRCorporation/bugs/35480_master_shutdown 
Disable signal handling while handling signal
 2016-09-12 07:59:08 +09:00
Mike Place
4e9490eebe Merge pull request #36214 from vutny/postgres-extension-doc 
`postgres_extension` state module: fix docstrings
 2016-09-12 07:58:29 +09:00
Denys Havrysh
5fe548f043 postgres_extension state module: fix docstrings 2016-09-11 23:17:40 +03:00
Mike Place
f11f093f8c Merge pull request #36203 from xiaoanyunfei/logowner 
fix owner of MultiprocessingLoggingQueue
 2016-09-11 18:15:15 +09:00
Mike Place
5b7b96c0b7 Merge pull request #36205 from vutny/postgres-tablespace-doc 
Add missing `maintenance_db` kwarg to `postgres_tablespace.present` doc
 2016-09-11 18:14:14 +09:00
Denys Havrysh
78296b90d8 Add missing maintenance_db kwarg to postgres_tablespace.present docstring 2016-09-10 12:20:40 +03:00
xiaoanyunfei
74dc90c7bb cancle pr last 2016-09-10 10:04:22 +08:00
xiaoanyunfei
90e4a25dd0 Merge branch 'logowner' of https://github.com/xiaoanyunfei/salt into logowner 2016-09-10 10:02:00 +08:00
xiaoanyunfei
ffd87b2f2f fix logqueue owner 2016-09-10 09:57:29 +08:00
xiaofei.sun
bd61b88fc8 fix log owner 2016-09-10 09:37:53 +08:00
xiaofei.sun
58160ed6c0 Merge branch '2016.3' of github.com:saltstack/salt into 2016.3 2016-09-10 09:06:21 +08:00
Thomas S Hatch
e13d61f06a skip all failhards if test=True 2016-09-09 16:09:33 -06:00
Thomas S Hatch
b586ed75bd if the backend stack traces when it should return an empty string (#36193) 2016-09-09 13:14:36 -06:00
Nicole Thomas
f035121291 Merge pull request #36188 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-09-09 12:59:20 -06:00
Nicole Thomas
6a5f7cb346 Ignore states that do not have a numeric jid, i.e. 'req' (#36185) 2016-09-09 11:28:48 -06:00
rallytime
521a7b2470 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/clouds/opennebula.py
 2016-09-09 09:53:02 -06:00
t2b
d4628f3c6b Allow additional kwargs in states.dockerng.image_present (#36156) 
Fixes #31513
 2016-09-09 09:32:38 -06:00
Dmitry Kuzmenko
229504efef Removed unused import. 2016-09-09 15:29:03 +03:00
Dmitry Kuzmenko
ca8eb7e076 Don't run the same signal handler twice. Catch os.kill errors. 
Else a Process Not Found error stops the killing loop and there are
still alive master subprocesses.
 2016-09-09 15:27:20 +03:00