valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,797 Commits 24 Branches 182 Tags 341 MiB
04753bf67c
Commit Graph

73797 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oz N Tiram
04753bf67c Fix a minor typo in docs (#36329) 2016-09-15 10:16:54 -06:00
Nicole Thomas
dedfd82894 Merge pull request #36309 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-14 16:13:26 -06:00
rallytime
ee8321eab1 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-14 15:18:22 -06:00
Nicole Thomas
fc890681da Merge pull request #36306 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-14 15:15:26 -06:00
rallytime
dd1769ea58 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/modules/file.py
  - salt/runners/cloud.py
  - salt/utils/gitfs.py
 2016-09-14 13:08:42 -06:00
Nicole Thomas
6a3019bbf1 Merge pull request #36299 from rallytime/gate-pkg-group-installed-test 
Gate the pkg.group_installed state test: not all pkg modules have group_install
 2016-09-14 13:04:26 -06:00
rallytime
9e15df9b23 Switch the order of the decorator 
When @requires_system_grains is listed before other decorators, wrapper
function gets confused on where the grains kwarg should go.
 2016-09-14 12:12:21 -06:00
Nicole Thomas
b3aac0ec20 Back-port #36273 to 2016.3 (#36295) 
* Add append_newline flag for #33686 (#36273)

* Add versionadded tag to new append_newline option
 2016-09-14 10:58:16 -06:00
Nicole Thomas
fe9194f609 Merge pull request #36298 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-14 10:57:52 -06:00
Nicole Thomas
729617923e Back-port #36124 to 2016.3 (#36296) 
* Use /etc instead of /root

* Skip test on anything but linux

* Add missing import (lint)
 2016-09-14 10:08:16 -06:00
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
683730cdd7 Merge pull request #36290 from DSRCorporation/bugs/36135_minion_stops_failover 
Don't stop to failover if all masters not reachable.
 2016-09-15 01:01:30 +09: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
Mike Place
56dabca43c Report the reason that a module did not load to the user via remote-ex (#36259) 2016-09-14 09:33:19 -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
087af91dcb Merge pull request #36294 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-15 00:19:31 +09: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
95dbe1ade4 Merge branch '2016.3' into 'carbon' 
Conflicts:
  - salt/fileserver/__init__.py
  - setup.py
  - tests/integration/modules/git.py
 2016-09-14 09:15:29 -06:00
rallytime
e2f1cf6025 Merge branch '2015.8' into '2016.3' 
No conflicts.
 2016-09-14 09:10:05 -06:00
Joseph Hall
3dec622eb6 Add append_newline flag for #33686 (#36273) 2016-09-14 09:04:58 -06:00
rallytime
fb994ad92f Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-09-14 09:00:05 -06:00
Dmitry Kuzmenko
aff2fbba94 Don't stop to failover if all masters not reachable. 2016-09-14 15:12:12 +03:00
Mike Place
33dcfda715 Merge pull request #36288 from cachedout/fix_schema_test 
Schema test requires jsonschema 2.5.0 or above
 2016-09-14 19:04:01 +09:00
Mike Place
1357244ef9 Schema test requires jsonschema 2.5.0 or above 2016-09-14 19:03:13 +09:00
Mike Place
b68ebd8e94 Merge pull request #36226 from cachedout/docker_client 
Catch instance where docker daemon might not be running
 2016-09-14 18:23:17 +09:00
Mike Place
3b81c37a53 Merge pull request #36286 from cachedout/fix_group_test 
Fix pkg group test by passing a list instead of str
 2016-09-14 16:51:08 +09:00
Mike Place
dde623bfd5 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 15:43:39 +09:00
Mike Place
6a76a3a7e0 Merge pull request #36265 from rallytime/merge-carbon 
[carbon] Merge forward from 2016.3 to carbon
 2016-09-14 14:32:15 +09: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
ad0326e4d7 Merge pull request #36266 from rallytime/merge-develop 
[develop] Merge forward from carbon to develop
 2016-09-14 14:29:13 +09:00
Mike Place
073b88eb5a Merge pull request #36261 from DSRCorporation/bugs/36081_salt-key_output_fix 
Fixed the changed salt-key output on accept/reject/delete actions.
 2016-09-14 14:28:28 +09:00
Mike Place
6d0a996891 Merge pull request #36267 from rallytime/bp-36257 
Back-port #36257 to carbon
 2016-09-14 14:26:54 +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
8119eb6a41 Merge pull request #36269 from gtmanfred/carbon 
begin adding tests for the openstack cloud provider
 2016-09-14 14:24:42 +09:00
Mike Place
295d58b46a Merge pull request #36276 from rallytime/test-35388 
Add unit tests for salt.cache.localfs.py
 2016-09-14 14:23:21 +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
Mike Place
64fdefafa9 Merge pull request #36283 from rallytime/avahi-beacon-stacktrace 
Protect the dbus import for a loader stacktrace in avahi_announce beacon
 2016-09-14 14:22:02 +09:00
Mike Place
5db74144b8 Merge pull request #36282 from terminalmage/fix-fileserver-test 
Fix for new integration test for fileserver.clear_file_list_cache
 2016-09-14 14:21:41 +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
rallytime
d18a37a03a Protect the dbus import for a loader stacktrace in avahi_announce beacon 2016-09-13 15:21:16 -06:00
Erik Johnson
fd28ca058f Fix for new integration test for fileserver.clear_file_list_cache 
The test suite actually has a ``prod`` env, but this test only considers
the ``base`` env. If a test is run which requests a file (or just the
file/dir/symlink/... list) from the ``prod`` env, then this will result
in the ``prod`` env's file list caches being present, and they will be
removed when the ``fileserver.clear_file_list_cache`` runner is
executed, showing up in the return data and causing the test to fail.

This tweak to the test ensures that we will always have a file list
cache for ``prod`` present, and adjusts the necessary asserts in the
test to expect the ``prod`` env in the return data from the runner.
 2016-09-13 15:55:51 -05: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
rallytime
57d8bd36ee Pylint fix 2016-09-13 13:27:46 -06: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
rallytime
faa27a82fa Pass the key kwarg through to the flush function 2016-09-13 11:08:43 -06:00
rallytime
1e9806950d Clean up imports in salt/cache/__init__.py 
the 'os' import is not used, and splitting them out into python vs. salt
imports makes them easier to read and more consistent with other salt files
 2016-09-13 11:03:47 -06:00
rallytime
387ed8bb9f Add unit tests for salt.cache.localfs.py 2016-09-13 10:52:15 -06:00