Commit Graph

70052 Commits

Author SHA1 Message Date
Justin Findlay
426384909d add 2016.3.4 release notes (#37125) 2016-10-20 15:03:03 -06:00
Justin Findlay
8c29949a0e log.setup: only assign user if defined 2016-10-20 14:28:42 -06:00
Justin Findlay
1d503f032c tests.integration: pass opts as a dict 2016-10-20 14:16:35 -06:00
Nicole Thomas
8c46d69251 Merge pull request #37109 from meaksh/zypper-distupgrade-support-2015.8
Some improvements for Zypper `dist-upgrade`
2016-10-20 13:41:08 -06:00
Nicole Thomas
2a35f57be8 Merge pull request #37120 from rallytime/bp-36246
Back-port #36246 to 2016.3
2016-10-20 13:38:32 -06:00
Nevins Bartolomeo
a9683cbbd8 allow the file.recurse state to support saltenv (salt://example/dir?saltenv=dev) 2016-10-20 14:08:04 -04:00
twangboy
f1c8d98119 Skip weird_install test on Mac OS X 2016-10-20 11:05:34 -06:00
twangboy
90de794290 Fix test_issue_6833_pip_upgrade_pip test on OSX 2016-10-20 11:05:28 -06:00
Sergey Kizunov
d7e3209e13 For IPCClient, remove entry from instance map on close
Remove the entry from the instance map so
that a closed entry may not be reused.
This forces this operation even if the reference
count of the entry has not yet gone to zero.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-10-20 16:06:35 +03:00
Sergey Kizunov
82e27634a7 Fix race condition when returning events from commands
It has been observed that when running this command:

```
salt "*" test.ping
```

sometimes the command would return `Minion did not return. [No response]`
for some of the minions even though the minions did indeed respond
(reproduced running Windows salt-master on Python 3 using the TCP
transport).

After investigating this further, it seems that there is a race condition
where if the response via event happens before events are being listened
for, the response is lost. For instance, in
`salt.client.LocalClient.cmd_cli` which is what is invoked in the command
above, it won't start listening for events until `get_cli_event_returns`
which invokes `get_iter_returns` which invokes `get_returns_no_block`
which invokes `self.event.get_event` which will connect to the event bus
if it hasn't connected yet (which is the case the first time it hits
this code). But events may be fired anytime after `self.pub()` is
executed which occurs before this code.

We need to ensure that events are being listened for before it is
possible they return. We also want to avoid issue #31454 which is what
PR #36024 fixed but in turn caused this issue. This is the approach I
have taken to try to tackle this issue:

It doesn't seem possible to generically discern if events can be
returned by a given function that invokes `run_job` and contains an
event searching function such as `get_cli_event_returns`. So for all
such functions that could possibly need to search the event bus, we
do the following:
- Record if the event bus is currently being listened to.
- When invoking `run_job`, ensure that `listen=True` so that `self.pub()`
will ensure that the event bus is listed to before sending the payload.
- When all possible event bus activities are concluded, if the event
bus was not originally being listened to, stop listening to it. This is
designed so that issue #31454 does not reappear. We do this via a
try/finally block in all instances of such code.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-10-20 16:06:28 +03:00
Pablo Suárez Hernández
330f830c9b Disables 'novendorchange' for old SLEs versions 2016-10-20 12:15:10 +01:00
Pablo Suárez Hernández
01b0a6917c Minor pylint fixes 2016-10-20 11:33:11 +01:00
Pablo Suárez Hernández
7dbb0bd252 Unit tests fixes 2016-10-20 10:59:48 +01:00
Pablo Suárez Hernández
e89982b6d2 Improves 'dryrun' outputting. Setting 'novendorchange' as not supported for SLE11 2016-10-20 10:24:21 +01:00
Pablo Suárez Hernández
c5a34cbadf Adds multiple repositories support to 'fromrepo' parameter 2016-10-20 10:19:17 +01:00
Denys Havrysh
cfc3a0ed92 pkgbuild.repo: add timeout parameter for waiting passphrase prompt 2016-10-20 11:51:58 +03:00
Mike Place
0b87e7890a Merge pull request #37103 from cachedout/fix_proc_test
Remove unnecessary sleep from unit.utils.process_test.TestProcessMana…
2016-10-20 17:45:07 +09:00
Mike Place
326bbd5e30 Merge pull request #36823 from terminalmage/pr-36806
Update debian systemd unit files to use default KillMode, Type=notify
2016-10-20 14:54:42 +09:00
Mike Place
0c40e71e17 Merge pull request #37030 from isbm/isbm-solaris-status-fix
Fix status.uptime for Solaris 9, 10 and 11.
2016-10-20 14:52:53 +09:00
Mike Place
38fdd28962 Merge pull request #37087 from vutny/gpg-fix-short-keyid
salt.modules.gpg: allow getting keys by short key ID
2016-10-20 14:49:32 +09:00
Mike Place
3a37a22366 Merge pull request #37088 from meaksh/zypper-distupgrade-support-2015.8
Adding 'dist-upgrade' support to the zypper module
2016-10-20 14:46:56 +09:00
Mike Place
2f29e9e956 Merge pull request #37090 from zer0def/silence-prereq-supervisord-warnings
Silence warnings about "__prerequired__" being an invalid kwarg when using `prereq` with supervisord states.
2016-10-20 14:46:17 +09:00
Mike Place
eb88c73222 Merge pull request #37101 from rallytime/merge-2016.3
[2016.3] Merge forward from 2016.3 to carbon
2016-10-20 14:39:24 +09:00
Mike Place
d7aebd1877
Remove unnecessary sleep from unit.utils.process_test.TestProcessManager.test_restarting 2016-10-20 14:29:10 +09:00
rallytime
b445a5e579 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/cp.py
2016-10-19 18:24:04 -06:00
Erik Johnson
68eeb29783 Add warning about GitPython 2.0.9 incompatibility with Python 2.6 (#37099) 2016-10-19 18:06:07 -06:00
Erik Johnson
fb6e545f78 Use NotifyAccess=all in all unit files
When systemd-python is not installed, systemd notification falls back to
using the systemd-notify for service notification. This cannot be used
however unless the unit has NotifyAccess=all set.

The particular use case for this is when Salt is installed using pip. We
don't put systemd-python into the requirements.txt because we can't be
sure that the minion supports systemd, so pip installs won't necessarily
have systemd-python available.
2016-10-19 12:50:30 -05:00
Erik Johnson
8d44efed78 Merge pull request #36958 from twangboy/fix_cmd_powershell
Fix bug where cmd.powershell fails to return
2016-10-19 11:03:58 -05:00
Thomas S Hatch
beb54b3ffa Merge pull request #37086 from cachedout/mm_req
Make salt-call a first-class citizen for multi-master
2016-10-19 09:19:08 -06:00
Pablo Suárez Hernández
c0641a4027 Fix in log message 2016-10-19 15:12:08 +01:00
Pablo Suárez Hernández
a092a974da Refactor: Cleanup and pylint fixes 2016-10-19 14:57:03 +01:00
zer0def
6a4bfbb485 Silence warnings about "__prerequired__" being an invalid kwarg when using prereq. (no refs) 2016-10-19 14:56:55 +02:00
Pablo Suárez Hernández
1331ae5c72 Unit tests for zypper upgrade and dist-upgrade 2016-10-19 13:21:55 +01:00
Bo Maryniuk
7d7b5ef9a9 Lintfix: E8303 too many blank lines 2016-10-19 13:56:31 +02:00
Pablo Suárez Hernández
4bcfef2ba2 Adding 'dist-upgrade' support to zypper module 2016-10-19 12:46:20 +01:00
Denys Havrysh
c589cba8a9 salt.modules.gpg: allow getting keys by short key ID 2016-10-19 13:31:15 +03:00
Mike Place
7dc15c1a48
Lint utils 2016-10-19 16:45:54 +09:00
Mike Place
9bbe3c998b
Lint error in publish 2016-10-19 16:45:08 +09:00
Mike Place
e22a3d2be6
Add multi-master support to publish.publish 2016-10-19 16:42:32 +09:00
Mike Place
7f141ba38c
Add function to search for substr in list 2016-10-19 15:55:02 +09:00
Mike Place
007eef84d7
Extend support to event.fire_master 2016-10-19 15:42:50 +09:00
Mike Place
8171c73b00
Multi-master support for salt-call 2016-10-19 15:38:01 +09:00
Mike Place
39d59ab0df Merge pull request #36880 from vutny/cp-get-salt-url
cp.get_url: fix `dest=None` behaviour with `salt://` URL
2016-10-19 12:10:45 +09:00
Mike Place
6b94153ea6 Merge pull request #36898 from clinta/x509-fixes
X509 fixes
2016-10-19 12:03:43 +09:00
Mike Place
a32b8cd741 Merge pull request #37025 from cro/freebsd_no_proc
Make salt.utils.minion._check_cmdline work on OSes without /proc.
2016-10-19 12:00:10 +09:00
Mike Place
e09d9f85c5 Merge pull request #37050 from twangboy/fix_win_service_state
Fix service state for Windows (DO NOT MERGE FORWARD)
2016-10-19 11:46:27 +09:00
Mike Place
5e998638a4 Merge pull request #37076 from jfindlay/proxy_doc
Document proxy settings
2016-10-19 11:30:27 +09:00
Mike Place
9ec366833e Merge pull request #37081 from terminalmage/issue37001
Fix archive.extracted remote source_hash verification
2016-10-19 11:22:22 +09:00
Mike Place
67faee1f94 Merge pull request #37064 from cachedout/issue_35097
Unify job check in scheduler
2016-10-19 11:08:05 +09:00
Erik Johnson
a3c4deeb82 Fix archive.extracted remote source_hash verification
When ``file.managed`` is invoked within an archive.extracted state to
pull down the source archive, ``file.extract_hash`` is invoked with
the unique name we created for it, rather than the actual source
filename. This causes hash extraction to fail, or only return a partial
match. Either of these cases causes the ``archive.extracted`` state to
fail.

This commit adds a new optional kwarg to ``file.get_managed`` which can
be used to override which filename we pass to ``file.extract_hash``, and
then passes this kwarg to the ``file.managed`` we invoke from within the
``archive.extracted`` state.
2016-10-18 16:08:34 -05:00