Commit Graph

80876 Commits

Author SHA1 Message Date
Erik Johnson
5f61928988 Merge pull request #40559 from jinm/develop
Fix v3 for https://github.com/saltstack/salt/issues/38472
2017-04-06 12:04:00 -05:00
Mike Place
60750a1619
Fix test 2017-04-06 10:48:27 -06:00
Erik Johnson
a7a78da984 remove unused imports 2017-04-06 11:12:07 -05:00
Joseph Hall
08d071bc68 Update Azure ARM docs 2017-04-06 09:43:19 -06:00
Erik Johnson
7f1ef72f83 Fix dockerng _get_client() regression
This fixes a regression I introduced the other day in #40481 when I
backported auth fixes to 2016.3. I changed how the client was
instantiated and ended up passing an unsupported kwarg to the wrapped
function. This resolves that regression.
2017-04-06 10:32:35 -05:00
rallytime
9b04dec7ef Merge branch '2016.11' into 'develop'
No conflicts.
2017-04-06 09:18:36 -06:00
Erik Johnson
a6d68f50fe Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 2017-04-06 10:15:47 -05:00
Nicole Thomas
00f8ef0c55 Merge pull request #40548 from Ch3LL/fix_vultrpy
Fix vultrpy
2017-04-06 09:13:51 -06:00
jinm
4ef3fa6722 Fix v3 for https://github.com/saltstack/salt/issues/38472 2017-04-06 10:42:30 -04:00
Erik Johnson
a717881f53 Just get a hash for the source archive
file.get_source_sum doesn't actually return a hash, it just
disambiguates a passed hash from a hash extracted from a hash file.
2017-04-06 08:58:56 -05:00
Silvio Moioli
35fcb8b52d Fix race condition on cache directory creation
os.makedirs() will raise OSError in case the directory passed as argument
already exists. We do check that this is not the case right before the
call, but there is still a tiny time window in which the directory might
be concurrently created between the isdir() check and the makedirs() call.

In some unlucky cases under heavy I/O the following stack trace is produced:

The minion function caused an exception: Traceback (most recent call last):
...
  File "/usr/lib/python2.7/site-packages/salt/fileclient.py", line 165, in cache_file
    return self.get_url(path, '', True, saltenv, cachedir=cachedir)
...
  File "/usr/lib/python2.7/site-packages/salt/fileclient.py", line 126, in _cache_loc
    os.makedirs(destdir)
  File "/usr/lib64/python2.7/os.py", line 157, in makedirs
    mkdir(name, mode)
OSError: [Errno 17] File exists: <PATH>
2017-04-06 09:26:09 +02:00
Pedro Algarvio
d8646f7122 Merge pull request #40550 from s0undt3ch/features/py3-pt2
Resource leakage fixes
2017-04-06 07:44:43 +01:00
Erik Johnson
9da4eb18bf Check hash of cached source against source_hash before downloading archive
This will force a re-download if the hash specified by source_hash if it
doesn't match the hash of the cached file, but if the hash matches, it
will skip the download. This will permit keep=True to prevent repeated
downloads of the source file, if and only if the source_hash also
remains the same.
2017-04-05 23:19:41 -05:00
Erik Johnson
8c61f333ae Don't use __opts__.get() for hash_type
First of all, the opts will never not have this key, as it has a default
value in salt/config/__init__.py. Second, the default hash type changed
to sha256 anyway in 2016.11, so we shouldn't be referring to a specific
hash type when it'll no longer be accurate after a merge-forward.
2017-04-05 21:35:56 -05:00
Erik Johnson
0918311330 Don't mark files that already were deleted as errors
Also use six.iteritems()
2017-04-05 21:23:15 -05:00
Erik Johnson
51d88a16c8 Merge branch 'zer0def-fix-31363' into 2016.3 2017-04-05 21:20:30 -05:00
Erik Johnson
7f3cbd5cf9 Merge branch 'fix-31363' of https://github.com/zer0def/salt into zer0def-fix-31363 2017-04-05 21:20:10 -05:00
Erik Johnson
ad24faa59d Fix three issues in archive.extracted state
1. The trim_output argument was ignored for archives extracted using
   tarfile.

2. file.get_source_sum would fail if "source" is a list

3. The checksum was being updated before we checked to see if it
   matched, effectively keeping us from detecting changes to the hash.

4. When source_hash_update is True, and the archive is extracted, and
   files are later removed from the extraction dir, the state would not
   re-extract the archive unless the source_hash had changed.
2017-04-05 20:15:22 -05:00
mtkennerly
5184fe98d1 Fix pylint issues in file.shortcut. 2017-04-05 19:36:06 -04:00
Pedro Algarvio
29d4ce83ab
Py3 compat 2017-04-05 23:56:28 +01:00
Pedro Algarvio
2d32fab65b
Don't instantiate the log handler if unable to connect to server 2017-04-05 23:29:13 +01:00
Pedro Algarvio
0b2364e57d
White-space lint fix 2017-04-05 23:19:53 +01:00
Pedro Algarvio
281e0cafb2
Fix resource leakage 2017-04-05 23:18:00 +01:00
Pedro Algarvio
843e218572
Remove unmocked patching 2017-04-05 23:17:36 +01:00
Pedro Algarvio
eb588c772a
Add missing futures import 2017-04-05 23:16:52 +01:00
Pedro Algarvio
dd7092c495
Add missing import 2017-04-05 23:15:54 +01:00
Mike Place
29cfdc6eb3 Merge pull request #40531 from terminalmage/pr-35740
Rebase/resubmit of PR #35740
2017-04-05 15:26:10 -06:00
Mike Place
641b59354d Merge pull request #40541 from bbinet/upstream-pillarstack
Update PillarStack stack.py to latest upstream version
2017-04-05 15:22:58 -06:00
Mike Place
cb9dcb1e1b Merge pull request #40543 from rallytime/fix-40005
Add the "fingerprint_hash_type" option to ssh state and module
2017-04-05 15:21:16 -06:00
Bo Maryniuk
aba94495a5 Lintfix (Py3 code compat) 2017-04-05 22:56:29 +02:00
Ch3LL
7710355e3a
check for salt install fail on vultur test 2017-04-05 14:39:31 -06:00
Nicole Thomas
4d7871e4d7 Merge pull request #40494 from rallytime/merge-develop
[develop] Merge forward from 2016.11 to develop
2017-04-05 14:15:05 -06:00
Ch3LL
aae3d14ea4
fix vultr cloud race condition to match on 0* 2017-04-05 14:05:49 -06:00
rallytime
71f3c73150 Merge branch '2016.11' into 'develop'
Conflicts:
  - salt/template.py
  - salt/utils/pycrypto.py
  - tests/integration/modules/test_state.py
  - tests/unit/states/test_artifactory.py
  - tests/unit/test_template.py
2017-04-05 13:02:14 -06:00
Nicole Thomas
3f0695575a Merge pull request #40540 from DSRCorporation/bugs/40494_merge_forward_cache_list_fix
A quick fix for Cache has no 'list' attribute.
2017-04-05 12:50:17 -06:00
Harris Dimitriou
c8dcfc75ca added 'versionadded' on documentation change 2017-04-05 12:54:19 -05:00
Harris Dimitriou
8d19790cda fixed show_pillar to support pillarenv 2017-04-05 12:54:19 -05:00
Harris Dimitriou
a781a0d0d1 fixed 'Template not found' error by adding a control in get_tops() not to look for top file if pillarenv is defined and is not equal to file_roots 2017-04-05 12:54:19 -05:00
Harris Dimitriou
d8de1254f5 git_pillar tries to respect pillarenv and only check when pillarenv = env, if pillarenv is set 2017-04-05 12:54:19 -05:00
Harris Dimitriou
9f0fda937e enabled pillarenv for state module 'state', now you can define pillarenv or if you dont state will try to find it from opts['pillarenv'] if passed on from orchestrate 2017-04-05 12:54:19 -05:00
Nicole Thomas
59db716817 Merge pull request #40510 from twangboy/deprecate_win_update
Add deprecation warnings to win_update state and execution modules
2017-04-05 11:47:56 -06:00
Mike Place
28fc048030 Merge pull request #40464 from terminalmage/userdata-renderer
salt-cloud: Do not pass userdata_file through yaml renderer
2017-04-05 11:32:06 -06:00
Mike Place
388fa4c5eb Merge pull request #40472 from daxroc/enhance/module/hadoop
Enhance/module/hadoop
2017-04-05 11:30:09 -06:00
Mike Place
f963e3be30 Merge pull request #40536 from github-abcde/utils-aws-header-fix
Utils aws sig4 header fix
2017-04-05 11:12:51 -06:00
Mike Place
846e51aed3 Merge pull request #40538 from q1x/develop
Support for Zabbix mediatypes in states
2017-04-05 11:11:20 -06:00
Mike Place
cfba4cb422 Merge pull request #40534 from terminalmage/issue39892
Check master's ssh_minion_opts for fileserver/pillar values and ignore them
2017-04-05 10:59:57 -06:00
rallytime
1ef81e6a55 Add the "fingerprint_hash_type" option to ssh state and module
Fixes #40005

This new option allows the user to specify what kind of hash was
used when the public key was hashed to a fingerprint. The default
hash is md5, but the user should be able to specify this if they
know what the fingerprint was originally hashed with.
2017-04-05 10:58:58 -06:00
Mike Place
ee5f891002 Merge pull request #40523 from s0undt3ch/features/py3
[WIP] A Little House Keeping and Addressing Py3 test suite leakage
2017-04-05 10:58:32 -06:00
Nicole Thomas
f5b2bcf82c Fix a couple more Oxygen --> Fluorine references 2017-04-05 10:27:28 -06:00
Nicole Thomas
990bde4c07 Merge pull request #40530 from dmurphy18/aix_docupd
Update release information for 2016.11.4 for additional AIX support
2017-04-05 10:20:22 -06:00