Commit Graph

66612 Commits

Author SHA1 Message Date
Justin Findlay
7340a29541 modules.mac_service: add show to API similar to systemd 2016-03-21 21:08:51 -06:00
Mike Place
a940c64981 Merge pull request #31994 from twangboy/mac_softwareupdate_int
Integration tests for mac_softwareupdate.py
2016-03-21 12:01:14 -06:00
Nicole Thomas
ce2bf355c2 Merge pull request #32010 from rallytime/bp-31794
Back-port #31794 to 2016.3
2016-03-21 09:55:35 -06:00
Nicole Thomas
7d153b426c Merge pull request #32011 from rallytime/bp-31896
Back-port #31896 to 2016.3
2016-03-21 09:55:06 -06:00
Nicole Thomas
cf174940f5 Merge pull request #32007 from sjorge/2016.3-smartos-nl
salt.states.smartos should handling newlines better
2016-03-21 09:16:23 -06:00
Mike Place
63133ebbb5 Add docs for master_tries
Refs #31794
2016-03-20 10:27:16 -06:00
Sergey Kizunov
d234c8627a Disabled pylint warning
I believe the pylint warning to be a false positive, so I disabled it
and added a comment explaining why.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-03-20 10:23:51 -06:00
Sergey Kizunov
ef7f3ed597 Add master_tries config option for minions
Description of `master_tries` config option:
- The number of attempts to connect to a master before giving up.
Set this to -1 for unlimited attempts. This allows for a master to have
downtime and the minion to reconnect to it later when it comes back up.
In 'failover' mode, it is the number of attempts for each set of masters.
In this mode, it will cycle through the list of masters for each attempt.

This is different than `auth_tries` because `auth_tries` attempts to
retry auth attempts with a single master. `auth_tries` is under the
assumption that you can connect to the master but not gain
authorization from it. `master_tries` will still cycle through all
the masters in a given try, so it is appropriate if you expect
occasional downtime from the master(s).

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-03-20 10:23:51 -06:00
Jorge Schrauwen
90065969f7 drop uneeded close 2016-03-20 14:40:17 +00:00
Jorge Schrauwen
6f19702385 fix handling of metadata and other values with spaces in them for salt.states.smartos 2016-03-20 14:34:59 +00:00
twangboy
c3258d1745 Remove redundant try/except blocks 2016-03-18 16:02:17 -06:00
twangboy
ded21b34be Remove logging 2016-03-18 14:59:54 -06:00
twangboy
894151b334 Fix test_schedule test 2016-03-18 14:53:26 -06:00
twangboy
0099ccb256 Finished integration tests 2016-03-18 14:42:03 -06:00
twangboy
0bf1672daf Fix set_catalog function 2016-03-18 14:40:03 -06:00
twangboy
4be9e36061 Fix reset_catalog for real 2016-03-18 14:36:26 -06:00
twangboy
382e0d86ad Fix reset_catalog function 2016-03-18 14:34:23 -06:00
Mike Place
fe86a3d209 Merge pull request #31943 from alprs/fix-salt_ssh_traceback
Salt-SSH: Prevent stacktrace from being written to the console
2016-03-18 14:31:49 -06:00
Mike Place
5e14844eef Merge pull request #31945 from alprs/fix-file_managed_diff
Fix diff never showing with file.managed state
2016-03-18 14:31:29 -06:00
Mike Place
0ce0ca9d15 Merge pull request #31962 from DSRCompany/features/intuit_failover_failback
Features/intuit failover failback
2016-03-18 14:30:55 -06:00
twangboy
fcf0ce2c7b Fix get_catalog 2016-03-18 14:29:21 -06:00
Mike Place
b216856783 Merge pull request #31990 from skizunov/develop2
Fix race condition with self.connected on TCP transport
2016-03-18 14:29:16 -06:00
Nicole Thomas
81583bb80c Merge pull request #31987 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-03-18 14:27:18 -06:00
twangboy
73f51a39ed Add checks to download 2016-03-18 14:22:15 -06:00
twangboy
182b80d67e Refactor update 2016-03-18 14:12:31 -06:00
twangboy
d41e62b1d3 Return immediately if there is nothing to update 2016-03-18 14:04:21 -06:00
twangboy
699080efbc Fix mismatched variable names 2016-03-18 13:59:36 -06:00
twangboy
38766a00af Fix schedule_enabled 2016-03-18 13:58:34 -06:00
twangboy
12668fe447 Fix integration tests
Code refactoring
Put cmd in lists
2016-03-18 13:53:40 -06:00
Sergey Kizunov
fb968f58d6 Fix race condition with self.connected on TCP transport
There is a race condition that occasionally happens when using
the TCP transport. When using the TCP transport, it will fire the
`__master_connected` event before returning from tcp.py's
`AsyncTCPPubChannel.connect_callback`. What sometimes happens is
that the event handler for `__master_connected` is executed before
the control is returned to `eval_master` in master.py. If this
happens, `self.connected` is not yet defined, since `eval_master`
defines it. The event handler for `__master_connected` tries to
access the not yet defined `self.connected` and an exception occurs.

One possible solution is to use `hasattr` to check if `self.connected`
is defined before accessing it in the `__master_connected` handler.
However, I think it is cleaner just to set `self.connected = False` in
`Minion.__init__`, that way this variable will be defined in all cases
and can be relied upon.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-03-18 14:43:17 -05:00
rallytime
a110b4d55d Don't overwrite previously mocked grains 2016-03-18 13:29:08 -06:00
twangboy
78bde65d2f Added ability to run commands passed as list 2016-03-18 13:17:57 -06:00
rallytime
1f9579f6e7 Pylint 2016-03-18 13:11:01 -06:00
twangboy
3cc607626f Added logging 2016-03-18 13:09:46 -06:00
twangboy
00e6aaa2f0 Use available 2016-03-18 13:06:19 -06:00
Dmitry Kuzmenko
52ba528c72 Updated status.ping_master docstring 2016-03-18 21:48:26 +03:00
Dmitry Kuzmenko
942b71b8b8 Failback to the topmost master in multimaster failover mode.
2 Options added:
master_failback: bool
master_failback_interval: int

With master_failback set to False works as before.
2016-03-18 21:48:26 +03:00
Dmitry Kuzmenko
e6fdfae4a4 Publish status.master outside the scheduler process.
This is done to avoid Scheduled processes hanging on timeout wait. This
breaks failover after the second master failed.
2016-03-18 21:48:26 +03:00
rallytime
fa4650523e Pylint fixes 2016-03-18 12:21:09 -06:00
twangboy
37ad44cb06 Change upgrade to update 2016-03-18 11:48:31 -06:00
twangboy
972e11db24 Improve error handling for mac_softwareupdate 2016-03-18 11:30:33 -06:00
twangboy
56c0abc4a5 Fix list_upgrades test 2016-03-18 11:30:33 -06:00
twangboy
3114357b13 Add integration tests for mac_softwareupdate 2016-03-18 11:30:33 -06:00
twangboy
dca667c853 Fix mac_softareupdate execution module 2016-03-18 11:30:33 -06:00
rallytime
6360ecd3b3 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cloud/clouds/scaleway.py
  - salt/config/__init__.py
  - salt/log/mixins.py
  - salt/minion.py
  - salt/modules/ps.py
  - salt/utils/decorators/__init__.py
  - salt/utils/schema.py
  - tests/unit/modules/etcd_mod_test.py
  - tests/unit/modules/file_test.py
2016-03-18 11:26:12 -06:00
Mike Place
ad8ada7eef Merge pull request #31981 from lloydoliver/linux-disk-grain-fix
include rotational disks in grains under linux
2016-03-18 09:54:00 -06:00
Nicole Thomas
00f5fedf53 Merge pull request #31955 from jtand/merge-31926-with-fixes
Disable some boto tests causing issues in the test suite on 2016.3
2016-03-18 09:50:37 -06:00
Mike Place
9be508e8f0 Merge pull request #31970 from twangboy/fix_win_file
Add apply_template_on_contents for windows
2016-03-18 09:37:29 -06:00
Mike Place
91c151ed55 Merge pull request #31966 from DSRCompany/features/intuit_multisyndic_ordered_failover
Add syndic ordered failover.
2016-03-18 09:36:00 -06:00
Nicole Thomas
810c6dbcbe Merge pull request #31960 from aletourneau/2015.8_ec2-getconsoleoutput
fixed ec2 get_console_output
2016-03-18 09:13:47 -06:00