Commit Graph

66130 Commits

Author SHA1 Message Date
Mike Place
2ce784fd5f Merge pull request #31635 from twangboy/mac_power_tests
Mac power tests
2016-03-03 11:55:41 -07:00
Mike Place
a43e5edc81 Merge pull request #31601 from cro/cfgmgmtcamp
Proxy fixes for #31585 and #31586
2016-03-03 11:34:07 -07:00
Mike Place
2226cb4d27 Merge pull request #31584 from skizunov/develop2
Fix Master AES key rotation on Windows
2016-03-03 11:20:28 -07:00
Mike Place
1ab330a605 Merge pull request #31628 from skizunov/develop3
Use LOOP_CLASS current() to share same IOLoop
2016-03-03 11:14:36 -07:00
C. R. Oldham
76d60a1528 Remove .orig file mistakenly added, reformat example. 2016-03-03 10:48:40 -07:00
twangboy
e953d34492 Add back skipIf decorator 2016-03-03 10:45:57 -07:00
Nicole Thomas
ac4be862f8 Merge pull request #31578 from alprs/feature-saltmod_state_queue
Allow queueing of state runs through saltmod
2016-03-03 09:04:43 -07:00
twangboy
2c4c81f55d Remove mock tests, only test _validate_minutes 2016-03-03 08:54:03 -07:00
twangboy
c181e9fcc5 Merge branch '2016.3' of https://github.com/saltstack/salt into mac_power_tests 2016-03-03 08:52:51 -07:00
C. R. Oldham
e397050536 Format the example? 2016-03-03 07:06:55 -07:00
C. R. Oldham
1214f48780 Format the example? 2016-03-02 16:11:26 -07:00
Mike Place
74b15dc4d5 Merge pull request #31590 from techhat/moresecure
Make cert perms more secure by default
2016-03-02 15:19:28 -07:00
Mike Place
4a7d6a6de1 Merge pull request #31599 from jfindlay/platform
add system name to platform versions report
2016-03-02 15:13:47 -07:00
Sergey Kizunov
fab78ebef6 Fix Master AES key rotation on Windows
Two issues causing this:
- On Windows, `stats.st_mode` is `0o100444` instead of what is checked
for which is `0o100400`. This is because basic Windows permissions
don't distinguish between user/group/all like Linux does. Note that
Windows Access Control Lists (ACLs) are not part of `stat` functionality.
- On Windows, `os.remove` will fail if a file is marked read-only. In
this case, need to mark it writable before deleting.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-03-02 16:11:26 -06:00
Sergey Kizunov
9f64274f9b Use LOOP_CLASS current() to share same IOLoop
This doesn't fix any issues but is an optimization and is the recommended
use in the Tornado docs. `LOOP_CLASS.current()` should be used unless
we want to use a different IOLoop than the main thread's IOLoop.
Not using `current()` makes sense in places such as SyncWrapper and MWorker.

However, for use in places such as `SMinion.__init__()`, what essentially
happens is that one IOLoop is used for the `run_sync()`. The `run_sync()`
invokes `start()`. `start() will make this IOLoop current, but it will put
the original current IOLoop back when it is finished, even if it is None.
So what essentially happens is that one IOLoop is used within the ZeroMQ
and TCP transports during the `run_sync` and another is used during
subsequent operations.

Using `current()` will either use the current IOLoop or create a new one
and call it current if none exists. This plays well with both the
ZeroMQ and TCP transports since they use current() internally and so the
same IOLoop will be used throughout execution, both before and after
the run_sync.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-03-02 16:00:05 -06:00
Andreas Lutro
50d91ebc6c allow queueing of state runs through saltmod 2016-03-02 22:18:35 +01:00
C. R. Oldham
99a73c4973 Lint. 2016-03-02 14:05:55 -07:00
Joseph Hall
6bf7d85dfe Lint 2016-03-02 13:43:27 -07:00
Joseph Hall
a11bcfb663 Restore previous umask when finished 2016-03-02 13:43:27 -07:00
Joseph Hall
83cfdf6a77 Make cert perms more secure by default 2016-03-02 13:43:27 -07:00
Nicole Thomas
3867af7793 Merge pull request #31623 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-03-02 13:03:38 -07:00
rallytime
ac69e4bf10 Fix merge bug caught by zypper test and user correct zypper test info 2016-03-02 12:19:47 -07:00
C. R. Oldham
eea06ef2cf Lint. 2016-03-02 11:29:02 -07:00
C. R. Oldham
a0761d3f06 Missin import 2016-03-02 11:26:56 -07:00
C. R. Oldham
1ce9d85dd4 Proxy minion release notes. 2016-03-02 11:26:56 -07:00
C. R. Oldham
90a574548b Fixes for #31585 and #31586 2016-03-02 11:26:56 -07:00
C. R. Oldham
a2a1c9d554 We said we would default add_proxymodule_to_opts to False in 2016.3 2016-03-02 11:26:56 -07:00
C. R. Oldham
7b949f1c07 More enhancements based on ConfigManagementCamp 2016-03-02 11:26:56 -07:00
C. R. Oldham
e4b80c05a4 pkg virtual provider enhancements for the rest_sample 2016-03-02 11:26:56 -07:00
rallytime
62390b616e Remove stray merge conflict line 2016-03-02 11:11:15 -07:00
Justin Findlay
2428f5f15d version: always show all system fields
This makes the system version info handling more consistent with the
dependency version info: there are no hidden fields.
2016-03-02 11:07:43 -07:00
Justin Findlay
2b8d1300e7 version: rename system and version platform info 2016-03-02 11:07:43 -07:00
Justin Findlay
ca40372bfa version: return mac_ver[2] only if it's defined 2016-03-02 11:07:43 -07:00
Justin Findlay
fabd39e6d5 version: add system platform to versions report
Some platforms, such as Darwin, do not postitively identify the platform
name in any of the other system fields currently in the versions report.

Improves #21906.
2016-03-02 11:07:43 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
twangboy
33da2c613e Add tests for the remainder of the functions 2016-03-02 10:20:00 -07:00
Nicole Thomas
38ddd62aef Merge pull request #31594 from rallytime/bp-31589
Back-port #31589 to 2015.8
2016-03-02 09:33:24 -07:00
Nicole Thomas
66a2e5f52f Merge pull request #31589 from techhat/updatenode
Ensure that the latest node data is returned
2016-03-02 09:31:52 -07:00
C. R. Oldham
86a0fc46b4 Merge pull request #31604 from joejulian/2015.8_31596_workaround_no_xml_when_not_tty
Workaround for non-xml output from gluster cli when not tty
2016-03-02 08:53:44 -07:00
Nicole Thomas
09815d905f Merge pull request #31602 from cachedout/fix_31523
Fix issue with salt-call hanging
2016-03-02 08:48:56 -07:00
Nicole Thomas
36ce240596 Merge pull request #31583 from vutny/remove-trailing-white-spaces
Remove trailing white spaces
2016-03-02 08:38:01 -07:00
Denys Havrysh
bbcad93a8d Fix trailing white spaces in Salt PRM spec file 2016-03-02 10:42:00 +02:00
Denys Havrysh
86433f2378 Revert changes in files used by roots_test.py integration test 2016-03-02 10:00:45 +02:00
Joe Julian
c567a823a9 Workaround for non-xml output from gluster cli when not tty
Gluster has a bug in versions prior to 3.6 in that they will replace the
cli output mode if isatty() returns false. This patch uses the script
utility to trick the cli into thinking it's being called from a tty to
allow xml output.

Upstream bug: https://bugzilla.redhat.com:443/show_bug.cgi?id=1047378

Fixes #31596
2016-03-01 18:02:01 -08:00
C. R. Oldham
c9fe8d87f3 Merge pull request #31592 from rallytime/bp-31546
Back-port #31546 to 2015.8
2016-03-01 16:51:02 -07:00
C. R. Oldham
c8dbc93ac6 Merge pull request #31593 from rallytime/bp-31570
Back-port #31570 to 2015.8
2016-03-01 16:50:05 -07:00
Mike Place
64f6046602 Fix issue with salt-call hanging
Refs #31523
2016-03-01 15:52:40 -07:00
Joseph Hall
6cd89459c7 Ensure that the latest node data is returned 2016-03-01 13:18:00 -07:00
C. R. Oldham
b2294d0a28 Need to return the value 2016-03-01 13:14:10 -07:00
Erik Johnson
9a296bd1bf Use clean_kwargs and invalid_kwargs utils funcs to handle invalid kwargs 2016-03-01 13:12:16 -07:00