Commit Graph

83051 Commits

Author SHA1 Message Date
rallytime
43643227c6 Skip 2 failing tests in Python 3 due to upstream bugs 2017-08-11 12:57:39 -04:00
Giandom
80fd733c99 Update slack.py 2017-08-11 18:37:52 +02:00
Daniel Wallace
05ecc6ac8d fix vmware for python 3.4.2 in salt.utils.vmware 2017-08-11 10:14:38 -06:00
Nicole Thomas
5962c9588b Merge pull request #42788 from amendlik/saltify-timeout
Remove waits and retries from Saltify deployment
2017-08-11 11:38:05 -04:00
Nicole Thomas
227ecddd13 Merge pull request #42877 from terminalmage/add-cron-state-virtual
Add virtual func for cron state module
2017-08-11 11:33:09 -04:00
Nicole Thomas
ab9f6cef33 Merge pull request #42859 from terminalmage/gitpython-git-cli-note
Add note about git CLI requirement for GitPython to GitFS tutorial
2017-08-11 10:53:02 -04:00
Nicole Thomas
c7750d5717 Merge pull request #42845 from brejoc/updates-for-kubernetes-2.0.0
API changes for Kubernetes version 2.0.0
2017-08-11 10:04:30 -04:00
Nicole Thomas
459fdedc67 Merge pull request #42678 from frankiexyz/2017.7
Add eos.rst in the installation guide
2017-08-11 09:58:36 -04:00
Nicole Thomas
4ce96eb1a1 Merge pull request #42778 from gtmanfred/spm
make sure to use the correct out_file
2017-08-11 09:44:47 -04:00
Nicole Thomas
682b4a8d14 Merge pull request #42856 from gtmanfred/2016.11
skip cache_clean test if npm version is >= 5.0.0
2017-08-11 09:39:19 -04:00
Nicole Thomas
3d05d89e09 Merge pull request #42857 from gtmanfred/vmware
use older name if _create_unverified_context is unvailable
2017-08-11 09:37:58 -04:00
Erik Johnson
f1de196740 Add virtual func for cron state module
This prevents a traceback when you attempt to use a cron state without
cron being installed.
2017-08-11 08:32:19 -05:00
Nicole Thomas
01ea854029 Merge pull request #42864 from whiteinge/syndic-log-root_dir
Make syndic_log_file respect root_dir setting
2017-08-11 09:28:21 -04:00
Nicole Thomas
7e8cfff21c Merge pull request #42866 from twangboy/osx_downgrade_gitpython
Change to GitPython version 2.1.1
2017-08-11 09:23:51 -04:00
Jochen Breuer
81674aa88a Version info in :optdepends: not needed anymore
Since this should work with 1.x.x and 2.x.x we don't have to provide a ersion info.
2017-08-11 11:20:42 +02:00
Jochen Breuer
71995505bc Not depending on specific K8s version anymore
Kubernetes imports are no longer version specific. Seems like the API change
was just a rename, so now we are importing either `V1beta1Deployment` or
`AppsV1beta1Deployment`. Usage stays the same.
2017-08-11 08:57:03 +02:00
twangboy
28053a84a6 Change GitPython version to 2.1.1
Version 2.1.4+ requires git to be installed, usually in the form of xcode
command line tools. 2.1.3 has a memory leak problem, 2.1.2 is not
available. So that leaves 2.1.1.
2017-08-10 17:39:58 -06:00
Seth House
4b1f55da9c Make syndic_log_file respect root_dir setting 2017-08-10 17:06:49 -06:00
twangboy
0d3789f0c6 Fix pkg.install salt-minion using salt-call
When executing `pkg.install salt-minion` using salt-call there is still a
python process running maintaining locks on files that the installer is
trying to overwrite. This is because the `install` function is using
`task.run_wait` which waits for the task to finish before returning
success. This is fine for standard programs that install using the
schedular, but bad for salt.

This change will use `task.run` and check that the task is actually
running and then return that the task was started. This will apply only
if the task was scheduled for `salt-minion` or `salt-minion-py3`.
2017-08-10 16:36:12 -06:00
Sergey Kizunov
5f85a03636 hash_and_stat_file should return a 2-tuple
Callers of `hash_and_stat_file` expect a 2-tuple and an exception will
be raised if only a single value is returned.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-08-10 16:57:34 -05:00
Erik Johnson
35e05c9515 Add note about git CLI requirement for GitPython to GitFS tutorial 2017-08-10 16:47:47 -05:00
Nicole Thomas
3ce18637be Merge pull request #42855 from rallytime/merge-2017.7
[2017.7] Merge forward from 2016.11 to 2017.7
2017-08-10 17:40:38 -04:00
rallytime
7f46603e9c Update account id value in boto_secgroup module unit test
This value was updated in moto 1.0.0 with the following commit:

5f3fbff627
2017-08-10 17:31:14 -04:00
rallytime
7c1d493fdd @mock_elb needs to be changed to @mock_elb_deprecated as well 2017-08-10 17:15:45 -04:00
Daniel Wallace
c1f673eca4 use older name if _create_unverified_context is unvailable 2017-08-10 14:43:33 -06:00
rallytime
3055e17ed5 Replace @mock_ec2 calls with @mock_ec2_deprecated calls
moto versions >= 1.0.0 have changed the way the mocked connections through
boto are handled with the @mock_ec2 decorator. They use the boto3 connection
method. However, since we are still using boto in many places, we need to use
the new @mock_ec2_deprecated decorator instead to handle the boto connection
functions for the unit tests.

Versions of moto < 1.0.0 are not Python 3 compatible, so salt-jenkins should
be installing newer versions of moto for those tests. Unfortunately, we cannot
install an older version of moto for Python2 that use the original @mock_ec2 call
and also import the @mock_ec2_deprecated function for newer versions of moto
simultaneously as the @mock_ec2_deprecated function doesn't exist in older
versions of moto.
2017-08-10 16:40:11 -04:00
Robert James Hernandez
744bf954ff Adding missing output flags to salt cli 2017-08-10 13:19:08 -07:00
Daniel Wallace
b458b89fb8 skip cache_clean test if npm version is >= 5.0.0 2017-08-10 14:17:47 -06:00
rallytime
08bbcf5790 Merge branch '2016.11' into '2017.7'
Conflicts:
  - salt/modules/win_pkg.py
2017-08-10 14:51:27 -04:00
Nicole Thomas
2dde1f77e9 Merge pull request #42851 from terminalmage/bp-42651
Backport #42651 to 2016.11
2017-08-10 14:02:38 -04:00
Daniel Wallace
a3da86eea8 fix syntax 2017-08-10 11:08:27 -05:00
Daniel Wallace
6ecdbcec1d make sure names are correct 2017-08-10 11:08:26 -05:00
Daniel Wallace
f83b553d6e add py3 for versionlock 2017-08-10 11:08:26 -05:00
Daniel Wallace
21934f61bb python2- prefix for fedora 26 packages 2017-08-10 11:08:25 -05:00
Nicole Thomas
f954f4f33a Merge pull request #42808 from terminalmage/issue42774
Fix regression in yum/dnf version specification
2017-08-10 11:59:22 -04:00
Dmitry Kuzmenko
7f5412c19e Make lint happier. 2017-08-10 18:54:46 +03:00
Dmitry Kuzmenko
ff66b7aaf0 Execute fire_master asynchronously in the main minion thread.
In another case it will block minion execution if master is not
responding.
This is actual for MultiMaster configuration because blocks minion to
respond to the active master requests if another one is down.
2017-08-10 17:55:26 +03:00
Jochen Breuer
d8f7d7a7c0 API changes for Kubernetes version 2.0.0
Switching to the new Kubernetes client lib API introduced with version 2.0.0.
2017-08-10 16:35:45 +02:00
Nicole Thomas
d9b0f44885 Merge pull request #42807 from rallytime/fix-42639
Update modules --> states in kubernetes doc module
2017-08-10 10:10:39 -04:00
Nicole Thomas
c746f79a3a Merge pull request #42806 from rallytime/fix-42683
Update doc references in glusterfs.volume_present
2017-08-10 10:10:16 -04:00
Nicole Thomas
27a8a2695a Merge pull request #42829 from twangboy/win_pkg_fix_install
Fix passing version in pkgs as shown in docs
2017-08-10 10:07:24 -04:00
Nicole Thomas
3c3ac6aeb2 Merge pull request #42838 from twangboy/win_doc_pki
Document requirements for win_pki
2017-08-10 09:59:45 -04:00
Nicole Thomas
b8c7bda68d Merge pull request #42841 from Mapel88/patch-1
Fix bug #42818 in win_iis module
2017-08-10 09:44:20 -04:00
Mapel88
497241fbcb Fix bug #42818 in win_iis module
Exception in function "create_cert_binding".
function fails with the following exception:
2017-08-09 00:23:32,096 [salt.state ][ERROR ][2948] An exception occurred in this state: Traceback (most recent call last):
File "c:\salt\bin\lib\site-packages\salt\state.py", line 1837, in call
**cdata['kwargs'])
File "c:\salt\bin\lib\site-packages\salt\loader.py", line 1794, in wrapper
return f(*args, **kwargs)
File "c:\salt\var\cache\salt\minion\extmods\states\win_iisV2.py", line 326, in create_cert_binding
ipaddress, port, sslflags)
File "c:\salt\var\cache\salt\minion\extmods\modules\win_iisV2.py", line 861, in create_cert_binding
if binding_info not in new_cert_bindings(site):
TypeError: 'dict' object is not callable


**This is the problematic code:
new_cert_bindings = list_cert_bindings(site)
if binding_info not in new_cert_bindings(site):

Just need to remove (site) from second line as follows and it's fixed:
new_cert_bindings = list_cert_bindings(site)
if binding_info not in new_cert_bindings:**
2017-08-10 10:39:43 +03:00
twangboy
f0a1d06b46 Standardize PKI Client 2017-08-09 17:53:22 -06:00
twangboy
7de687aa57 Document requirements for win_pki 2017-08-09 17:49:20 -06:00
garethgreenaway
b3e2ae3c58 Merge pull request #42805 from rallytime/bp-42552
Back-port #42552 to 2016.11
2017-08-09 15:37:55 -07:00
garethgreenaway
d2ee7934ed Merge pull request #42804 from rallytime/bp-42784
Back-port #42784 to 2016.11
2017-08-09 15:37:40 -07:00
garethgreenaway
135f9522d0 Merge pull request #42782 from rallytime/fix-42697
Add a cmp compatibility function utility
2017-08-09 15:37:29 -07:00
Nicole Thomas
4cbf8057b3 Merge pull request #42826 from terminalmage/fix-spelling
Fix misspelling of "versions"
2017-08-09 15:39:42 -04:00