Commit Graph

73797 Commits

Author SHA1 Message Date
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
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
Shane Lee
d9bbba9b24 Add missing documentation for the mac_package module (#36192)
* Add missing documentation for the mac_package module

* Standardize ID in docstrings
2016-09-12 11:57:41 -06:00
Tom Williams
e95b55b106 INFRA-3692 - add support for absolute paths to yaml files in makostack ext_pillar module. (#36220) 2016-09-12 11:56:45 -06: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
Shane Lee
019ef1c47c Remove invalid JSON for Mac OS X (#36167)
* Remove invalid JSON for Mac OS X

* Check for fsevents line and remove
2016-09-12 11:42:43 -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
Nicole Thomas
9ce4abefcd Merge pull request #36234 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-09-12 11:40:30 -06:00
Nicole Thomas
414f7296fd Merge pull request #36233 from rallytime/merge-develop
[develop] Merge forward from carbon to develop
2016-09-12 11:40:18 -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
rallytime
c3dcbb5906 Merge branch '2016.3' into 'carbon'
Conflicts:
  - salt/modules/win_pkg.py
  - salt/states/dockerng.py
  - salt/utils/process.py
2016-09-12 09:47:33 -06:00
rallytime
87341ed30b Merge branch 'carbon' into 'develop'
No conflicts.
2016-09-12 09:42:26 -06:00
Valentin Rosavitskiy
63e49a3d86 Add support for new OS VZ7 try #2 (#35123) (#36230) 2016-09-12 09:36:09 -06:00
Hengyang Hu
3c694a371b make a centralized master_event func, replace the hardcoded ones across the codebase (#36221) 2016-09-12 09:22:20 -06:00
Nicole Thomas
2b588e3d2f Versionadded should be Nitrogen instead of 2016.3.0 (#36231)
Refs #36207
2016-09-12 09:17:26 -06:00
Olivier Mauras
1c2c041d0d Feature: Add Alpine Linux support (#36207)
* salt/modules/gentoo_service.py: Work also for Alpine which uses OpenRC as well

* salt/modules/apk.py: Add main pkg function for Alpine Linux

* salt/modules/apk.py: Fix list_upgrades

* salt/modules/apk.py: Remove opkg occurences

* salt/modules/apk.py: Return 'Not available' instead of True for unavailable functions

* salt/modules/apk.py: Comment the unavailable functions

* salt/modules/apk.py: Implement pkg.latest_version

* salt/modules/apk.py: Some more spaces between functions

* salt/modules/apk.py: Include release version in pkg_version  returned by pkg.list_pkgs to prevent missing packages returned on pkg.upgrade

* salt/modules/apk.py: Fix lint errors
2016-09-12 09:14:44 -06:00
boltronics
559a82d678 Command logging output fixes (#36103)
* Improve command logging by stripping whitespace

The YAML ">" block scalar modifier introduces a trailing new line
character, which breaks up the command output formatting. This can
result in ERROR lines being harder to spot if among broken INFO lines.

* Improve state info log output
2016-09-12 09:04:42 -06:00
Erik Johnson
b0ddd6dbba Refspec customization (#36216)
* Added refspec customization to git.latest

* Add documentation for new refspec params to git.latest
2016-09-12 09:01:16 -06:00
Mike Place
f755e6d890 Fire an event on the master when a refresh occurs (#36219)
Closes #31465
2016-09-12 08:46:33 -06:00