Commit Graph

73924 Commits

Author SHA1 Message Date
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
Kris Raney
eb414f9c26 Add support for ElasticsearchVersion parameter 2016-09-13 15:26:40 -05:00
kbelov
f1b591fef6 Merge branch 'boto_apigateway_usage_plan' of https://github.com/kraney/salt into boto_apigateway_usage_plan 2016-09-13 13:22:55 -07: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
twangboy
c01ec228e1 Skip weird_install test on Mac OS X 2016-09-13 11:35:38 -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
Daniel Wallace
2d716131da Add test to check openstack in libcloud
With apache-libcloud 0.20.0
2016-09-13 10:25:43 -05:00
Daniel Wallace
b488cf2420 add __main__ function for keystone test 2016-09-13 10:23:04 -05:00
Aditya Kulkarni
dd670bd18f Fix lint error and add try except 2016-09-13 10:30:28 -04:00
Mike Place
3588ceeb10 Have proxy sublcass new minionmanager
Otherwise the event bus won't be initialized at all.

Refs #33664.

Closes #36173
2016-09-13 08:27:31 -06:00
rallytime
e385f55588 Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-13 08:25:11 -06:00
rallytime
e6a412dd49 Merge branch '2016.3' into 'carbon'
No conflicts.
2016-09-13 08:23:51 -06: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
Dmitry Kuzmenko
411cbb373f Fixed the changed salt-key output on accept/reject/delete actions. 2016-09-13 16:31:40 +03:00
Mike Place
60ef970ce4 Have proxy sublcass new minionmanager (#36257)
Otherwise the event bus won't be initialized at all.

Refs #33664.

Closes #36173
2016-09-13 07:13:01 -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
3e2375c829 Merge pull request #36176 from twangboy/mac_service_tests
Fix test_launchctl test in mac_service
2016-09-13 16:31:46 +09:00
Mike Place
c997d224b8 Merge pull request #36209 from vieira/once_per_interface
Fixes routes being installed with wrong interfaces
2016-09-13 09:57:42 +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
Mike Place
3833c9e095 Merge pull request #36247 from terminalmage/issue36150
Add a runner function to clear fileserver list caches
2016-09-13 09:17:05 +09:00
Mike Place
5063cd0335 Merge pull request #36248 from Ch3LL/fix_archive_test
fix archive test to only run on redhat
2016-09-13 09:15:24 +09:00
Ch3LL
9ede50b451 fix archive test to only run on redhat 2016-09-12 15:43:06 -06:00
Erik Johnson
38e700c977 Reduce fileserver_list_cache_time default to 20 sec 2016-09-12 16:29:10 -05:00
Erik Johnson
b7a1a67828 Improve accuracy of fileserver runner tests
The tests that return files, symlinks, directories, and empty dirs were
all only testing that the type of the return data was the same as what
was expected. By not testing the content, we overlooked a corner case in
which backends passed into the fileserver as a Python list would not be
handled properly. This has since been fixed in PR #36244, but these
tests will help keep this sort of issue from regressing.
2016-09-12 16:29:10 -05:00
Erik Johnson
ae973a14fb roots backend: Don't include '.' or '..' in empty_dirs 2016-09-12 16:29:10 -05:00
Erik Johnson
322047a844 Add integration tests for fileserver.clear_file_list_cache 2016-09-12 16:29:10 -05:00
Erik Johnson
d3e9c4c5fb Couple fixes to _gen_back
1. Wasn't properly handling the backend being passed in as a Python list
2. Didn't work properly in the test suite due to the backend being an
   ImmutableList instead of a list. This is because of how the opts are
   loaded in the test suite, all mutable types are immutable versions of
   themselves from salt.utils.immutabletypes.
2016-09-12 16:29:10 -05:00
Erik Johnson
6722ad9ecf Add runner function to remove file list caches 2016-09-12 16:29:10 -05:00
Erik Johnson
26c426f22a Add function to remove fileserver list caches to fileserver class 2016-09-12 16:29:09 -05:00
Erik Johnson
37c48472d6 Add documentation for fileserver_list_cache_time 2016-09-12 16:29:09 -05:00