Commit Graph

83135 Commits

Author SHA1 Message Date
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
twangboy
83b9b230cd Add winrepo to docs about supporting versions in pkgs 2017-08-09 12:05:42 -06:00
twangboy
81fefa6e67 Add ability to pass version in pkgs list 2017-08-09 11:59:32 -06:00
Erik Johnson
00f93142e4 Fix misspelling of "versions" 2017-08-09 12:24:06 -05:00
Adam Mendlik
dc20e4651b Ignore error values when listing Windows SNMP community strings 2017-08-08 14:40:16 -06:00
Erik Johnson
c69f17dd18 Add integration test for #42774 2017-08-08 14:20:42 -05:00
Erik Johnson
78d826dd14 Fix regression in yum/dnf version specification
Resolves #42774.
2017-08-08 13:55:35 -05:00
rallytime
152eb88d9f Update modules --> states in kubernetes doc module
The kubernetes state docs are not rendering/building due to a typo
in the doc module.

Fixes #42639
2017-08-08 14:42:34 -04:00
rallytime
8c8640d6b8 Update doc references in glusterfs.volume_present
The "created" option has been deprecated in favor of volume_present
and the docs need to match.

Fixes #42683
2017-08-08 14:35:53 -04:00
remijouannet
5a91c1f2d1 update consul module following this documentation https://www.consul.io/api/acl.html 2017-08-08 14:21:49 -04:00
Daniel Wallace
dbd29e4aaa only read file if it is not a string 2017-08-08 14:19:00 -04:00
Nicole Thomas
de997edd90 Merge pull request #42786 from Ch3LL/fix_typo
Fix typo for template_dict in http docs
2017-08-08 14:14:50 -04:00
Nicole Thomas
ac752223ad Merge pull request #42784 from gtmanfred/http
only read file if ret is not a string in http.query
2017-08-08 13:20:12 -04:00
Nicole Thomas
bf6153ebe5 Merge pull request #42795 from lomeroe/bp-42744_201611
backport #42744 to 2016.11
2017-08-08 13:17:14 -04:00
Nicole Thomas
44995b1abf Merge pull request #42794 from lomeroe/bp-42744
Backport #42744 to 2017.7
2017-08-08 13:16:30 -04:00
Sergey Kizunov
fa5822009f Fix exception when master_type=disable
The following exception occasionally occurs when `master_type=disable`:

```
  File "/usr/lib/python2.7/site-packages/salt/minion.py", line 1989,
  in handle_event
    self._fire_master(data['data'], data['tag'], data['events'],
    data['pretag'])
  File "/usr/lib/python2.7/site-packages/salt/minion.py", line 1261, in
  _fire_master
    'tok': self.tok}
AttributeError: 'Minion' object has no attribute 'tok'
```

This occurs because it tries to fire a master event when the minion
is not connected to the master, in this case due to an action from a
beacon.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2017-08-08 11:55:25 -05:00
Sebastian Sobczynski
1cc86592ed Update return data before calling returners 2017-08-08 16:19:29 +01:00
lomeroe
695f8c1ae4 fix #42600 in develop
attempt to write data to regpol file even if data_to_write is empty
(i.e. no policies configured)
2017-08-08 09:24:51 -05:00