Commit Graph

78410 Commits

Author SHA1 Message Date
Mike Place
a0bd04b392 Merge pull request #39194 from bodhi-space/infra1963
INFRA-1963 - add boto3_route53 exec and state modules
2017-02-15 13:03:26 -07:00
Mike Place
64e164dcbc Merge pull request #39364 from gtmanfred/default_user
set default user variable to the user cmd runs as
2017-02-15 12:48:55 -07:00
toller
88741021ad Fix typo and newlines in log messages. 2017-02-15 12:33:56 -07:00
Jean-Claude Computing
94f349a900 Fix documentation for detach's default value 2017-02-15 20:29:29 +01:00
Mike Place
881ebf2e93 Merge pull request #39424 from twangboy/win_fix_dos
Fix problem with too many connection attempts in Windows
2017-02-15 11:51:34 -07:00
Mike Place
ff7aa83532 Merge pull request #39414 from Unity-Technologies/hotfix/salt-cloud-windows-dev
Added a way to override the default used transport for winrm
2017-02-15 10:40:18 -07:00
rallytime
6d78adbf08 Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/topics/tutorials/gitfs.rst
  - salt/fileserver/roots.py
  - salt/loader.py
2017-02-15 10:35:02 -07:00
Mike Place
9e88357f3e Merge pull request #39410 from cetanu/develop
allow non-hostname characters in vmware obj name
2017-02-15 10:35:02 -07:00
Mike Place
47872355a8 Merge pull request #39419 from The-Loeki/bp-ssh-ipv6
Backport Salt-SSH IPv6 fixes to 2016.11
2017-02-15 10:33:12 -07:00
Mike Place
b79bf15b64 Merge pull request #39407 from techhat/spmver
Add package version control to SPM
2017-02-15 10:29:28 -07:00
Erik Johnson
4ff13acf8b salt.fileserver.roots: Fix regression in symlink_list (#39409)
A recent PR of mine removed the logic in symlink_list and fell back to
the cached file list generated in _file_lists(). However, this code
dates back from before the fileserver backends' symlink_list() functions
were modified to return a dict mapping links to their destinations.

This fixes the code in _file_lists() so that it returns the correct
data. It also fixes the fact that '.' was showing up in the dir list
produced by _file_lists(), and updates the associated integration test
to include the cachedir in the mocked opts.
2017-02-15 10:06:17 -07:00
twangboy
d3f7dd7f50 Add sleep to eval_master 2017-02-15 09:45:09 -07:00
Ronald van Zantvoort
4fc5626f16 Don't overwrite self.host w/IPv6 brackets 2017-02-15 15:44:06 +01:00
Ronald van Zantvoort
dd1223468b Salt-SSH deal with raw IPv6 addresses 2017-02-15 15:43:51 +01:00
Daniel Hobley
c1c19a8731 Added a way to override the default used transport for winery
- Delete temporary files with winrm instead of using smb
2017-02-15 10:14:04 +01:00
Eric Radman
5325c05d37 Do not silently fail salt orchestration
Report failures if salt-run is unable to communicate with a minion. If a target
matches more than one host, the successful changes are reported and the rule is
reported as a failure.
2017-02-14 22:17:01 -05:00
Vasili Syrakis
6faa03431b allow non-hostname characters in vmware obj name 2017-02-15 11:05:34 +11:00
Pedro Algarvio
fc59d5e832 Python 3 Fixes (Pt. 2) (#39397)
* Typo in comment

* First convert to string if not already a string. Then to bytes under Py3.

The reason being that jids from the CLI, at least the one fed in
integration.runners.jobs.ManageTest.test_loopup_jid is loaded as an
integer, and, while the Py2 code converts JIDs to strings, under Py3, we
assume JID's are already strings.

* Mark tests which require root permissions to run

* Allow declaring that the function IS a class method.

```
Python 3.5.3 (default, Jan 21 2017, 00:29:12)
[GCC 6.3.1 20170109] on linux
Type "help", "copyright", "credits" or "license" for more information.
>>> class Foo:
...     def bar(self):
...         print('bar')
...
>>> import inspect
>>> inspect.ismethod(Foo.bar)
False
>>> inspect.ismethod(Foo().bar)
True
```

On Python 2, `inspect.ismethod` returns `True` for bound and unbound
methods while on Python 3 it only returns `True` for bound methods.
The explicit `is_class_method` is to avoid instantiating the class just
to get the function signature.

* Always decode responses to the Python version native string implementation

* Just compare the objects as matching list.

Asserting same item count doesn't make that much sense.

* Py3 compatibility

* Fix saltnado tests under Py3

* Python 3 compatibility

* Show me the full traceback

* Revert "Convert fileserver data from bytes to strings"

This reverts commit e53972f8c6.

* Revert "Under Py3, we get `bytes` when using the roots backend directly"

This reverts commit 9f73b240c1.

* Convert from bytes to str if not a binary file

* Py3 compatibility fixes.

Convert file contents from bytes to string if not a binary file
2017-02-14 16:20:56 -07:00
Joseph Hall
b5d56890ce Add list commands to SPM (#39401) 2017-02-14 16:14:46 -07:00
Joseph Hall
fc0366dfee Move dl_list to proper scope 2017-02-14 16:10:21 -07:00
Joseph Hall
ad7d7e60df Add package version control to SPM 2017-02-14 14:09:22 -07:00
Joseph Hall
03a6a9e9cf Fix Aliyun lint errors (#39403)
* Fix Aliyun lint errors

* Bad spacing

* More bad spacing
2017-02-14 13:49:57 -07:00
Nicole Thomas
3a39e15dff Rewrite blockdev unit test to target more specific state returns (#39402)
The previous way this test was written was over-mocking some of the
state returns as well as tested and asserted against incorrect
behavior as shown in issue #39255. (The test asserted that a return
of '' from the call to _checkblk() was correct, which was hiding a
bug as noted in #39255 and fixed in #39272.)
2017-02-14 13:49:14 -07:00
toller
2cc6ce7b51 Add subnetwork support to GCE Cloud Module.
Implements #39258
2017-02-14 12:48:57 -07:00
twangboy
e59e814844 Add helper functions for Flags and Dacl classes 2017-02-14 12:12:15 -07:00
Mike Place
09c29b3405 Merge pull request #39301 from twangboy/win_iis
Additional functions to win_iis module
2017-02-14 11:58:06 -07:00
Mike Place
370b3409ad Merge pull request #39351 from ninja-/reduce_fileclient_latency
Reduce fileclient latency by merging _file_hash and _find_file
2017-02-14 11:55:22 -07:00
Daniel Wallace
aaf95da31a set default user variable to the user cmd runs as 2017-02-14 12:51:32 -06:00
Mike Place
8b8ab8ef8e Merge pull request #39362 from dincamihai/cp-push-test-2016.3
Add cp.push test
2017-02-14 11:42:10 -07:00
Mike Place
878946d0f8 Merge pull request #39379 from terminalmage/issue34821
win_pkg: remove all installed versions when no explicit version passed
2017-02-14 11:41:28 -07:00
Mike Place
868e170b92 Merge pull request #39376 from jmickle/develop
adding librato metrics returner
2017-02-14 11:39:34 -07:00
Mike Place
fd9ab8e4e3 Remove extra newline 2017-02-14 11:34:54 -07:00
Mike Place
4b726f955b Merge pull request #39380 from joe-niland/quote-numeric-usernames
Quote numeric user names so pwd.getpwnam handles them properly
2017-02-14 11:33:32 -07:00
Mike Place
1116d32df9 Merge pull request #39400 from meaksh/2016.3-fix-local-cache-issue
Prevents 'OSError' exception in case certain job cache path doesn't exist
2017-02-14 11:27:03 -07:00
Mike Place
2b67008770 Merge pull request #39374 from techhat/spmcache
Switch SPM to salt.cache
2017-02-14 10:58:10 -07:00
Mike Place
12b92511f9 Merge pull request #39388 from steinliber/repair_aliyun_api_problem
Repair aliyun api problem
2017-02-14 10:56:59 -07:00
Mike Place
471baea629 Merge pull request #39381 from cachedout/docs_fix
Docs test fix
2017-02-14 10:53:27 -07:00
Mike Place
359fc24500 Merge pull request #39398 from ccin2p3/bug32207
Fix gpg renderer when called without tty.
2017-02-14 10:53:00 -07:00
Mike Place
caffef88cf Merge pull request #39392 from alprs/fix-nested_output_ordered_dict
Make sure OrderedDict order is preserved in nested output
2017-02-14 10:50:14 -07:00
Mike Place
f2459e3ce8 Merge pull request #39378 from dmurphy18/deb_pkg_fix
Update make_repo in debbuild.py execution module to utilize timeout
2017-02-14 10:10:14 -07:00
Erik Johnson
a557422516 Merge pull request #39290 from mephi42/32356
Support globbing in sources parameter of salt.modules.archive (#32356)
2017-02-14 10:38:37 -06:00
twangboy
d0240e7c7d Clarify docs for create_site 2017-02-14 09:37:30 -07:00
Pablo Suárez Hernández
e7e559ef5c Prevents 'OSError' exception in case path doesn't exist 2017-02-14 16:17:26 +00:00
Mihai Dinca
91383c5a19 Add cp.push test 2017-02-14 17:16:28 +01:00
Foudil BRÉTEL
d1e40d900b Fix gpg renderer when called without tty. 2017-02-14 16:39:51 +01:00
Andreas Lutro
625a770a23 make sure OrderedDict order is preserved in output
sorted(ret) will sort the keys on their own, discarding the original
order of the OrderedDict.
2017-02-14 13:40:09 +01:00
stein
cb3273b863 reapair error 2017-02-14 14:52:04 +08:00
Jonathan Mickle
3975429f48 more pep8 stuff 2017-02-13 22:30:10 -08:00
Jonathan Mickle
e270e9586b linter fixes 2017-02-13 22:28:49 -08:00
Jonathan Mickle
3a75abad6b this try is unnecesarry 2017-02-13 17:38:37 -08:00