Commit Graph

6132 Commits

Author SHA1 Message Date
Mike Place
3f324faa07 Merge pull request #29871 from skizunov/develop2
Fixed Windows salt-master memory leaks in logger
2015-12-21 11:10:10 -07:00
Mike Place
23bffbb623 Merge pull request #29875 from akissa/add-postgres_language-state
Add PostgreSQL Language management functionality
2015-12-21 10:39:46 -07:00
Mike Place
207bb5af0c Merge pull request #29830 from terminalmage/issue29064
Optimizations/bugfixes/feature adds for systemd execution module
2015-12-21 10:37:36 -07:00
Andrew Colin Kissa
f921a88a30 lint 2015-12-20 20:41:40 +02:00
Sergey Kizunov
793c0bef75 Fixed Windows salt-master memory leaks in logger
__process_multiprocessing_logging_queue:
- A leak was observed in this process on Windows. On Windows, creating a
new process doesn't fork (copy the parent process image). Due to this, we
need to setup extended logging inside this process. The leak was due to
the temp null and temp logging handlers being active which just store
messages but don't process them. Setting up extended logging removes
those handlers and fixes the leak (as well as properly dealing with
incoming logging messages).

setup_multiprocessing_logging:
- A leak was obversed in processes that used this on Windows. Similar
to above, due to lack of fork, the new process will have the temp null
and temp logging handlers enabled, causing the leak. In this function,
removing those handlers prevents the leak.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-12-20 09:05:19 -06:00
Andrew Colin Kissa
a826720371 Add PostgreSQL Language management functionality
Fixes #29874
2015-12-20 09:37:41 +02:00
Erik Johnson
15047918a9 systemd test fixes
This removes a bunch of tests that don't test anything (see https://github.com/saltstack/salt/issues/29852).

It also changes some of the tests to reflect recent changes in
systemd.py.
2015-12-18 15:17:38 -06:00
Andrew Colin Kissa
98593a94d5 fix various bugs in augeas modules
Fixes #29842
2015-12-18 23:01:44 +02:00
lburg
6d1ab2ece0 states.timezone: Fix 'desrired' typo 2015-12-18 13:54:04 +01:00
Andrew Colin Kissa
b749b9faba Add Pillar SQLCipher module
Fixes #29781
2015-12-17 09:48:27 +02:00
Nicole Thomas
cb10aad1b3 Merge pull request #29774 from cachedout/splay_jenkins
Splay sleeps inside jenkins
2015-12-16 16:55:53 -07:00
Mike Place
1c65cdcbc4 Splay sleeps inside jenkins 2015-12-16 14:48:51 -07:00
Mike Place
613213b921 Merge pull request #29757 from cachedout/refresh_db
Skip refresh db test if upstream repo does not repsond.
2015-12-16 13:23:16 -07:00
Mike Place
83df4c4c75 Skip refresh db test if upstream repo does not repsond. 2015-12-16 10:23:10 -07:00
Mike Place
aab929d196 Merge pull request #29718 from thusoy/issue-29423
Support match-sets in iptables module
2015-12-16 07:48:18 -07:00
Tarjei Husøy
387ac2ce5e Support match-sets in iptables module
Based on work by @l13t in https://github.com/saltstack/salt/pull/29426.

Added tests and fixed incorrect appending of the built rule.

Closes #29423.
2015-12-15 16:35:06 -08:00
Mike Place
a2b1f41f49 Disable some boto tests per resolution of moto issue
Pending resolution of https://github.com/spulec/moto/issues/493
2015-12-15 14:57:52 -07:00
Colton Myers
5ac96cc8ba Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/tls.py
    salt/states/git.py
    salt/transport/tcp.py
2015-12-14 15:56:26 -07:00
Alexandre Garnier
f3a2b27671 Fix deb_apache states methods tense 2015-12-13 13:58:27 +01:00
Mike Place
8b336dc1b4 Merge pull request #29638 from cachedout/fix_29535
Fix 29535
2015-12-11 13:37:42 -07:00
Mike Place
5bda5ff664 Updated pip module internal check for log. 2015-12-11 13:36:51 -07:00
Mike Place
14a19f9313 Merge pull request #29634 from cachedout/lint_29459
Lint 29459
2015-12-11 12:53:07 -07:00
Mike Place
3514765d33 Merge pull request #29573 from kraney/boto_lambda
An implementation of support for AWS Lambda
2015-12-10 13:01:26 -07:00
Kris Raney
c024ca70b1 A few missed lint errors 2015-12-09 16:52:10 -06:00
Kris Raney
4e04c3fbbd Fix lint warnings, add log when using default region 2015-12-09 16:03:20 -06:00
Kris Raney
f33d7a761c Fix unit test to work with code that understands FunctionArn 2015-12-09 12:49:27 -06:00
Mike Place
78fa3111a7 Merge pull request #29571 from cachedout/lint_29493
Lint #29493
2015-12-09 09:28:17 -07:00
Mike Place
ab439e9173 Lint 2015-12-09 09:27:12 -07:00
Andreas Lutro
7c69c177ed update test 2015-12-09 13:18:47 +01:00
Justin Findlay
45acd05065 state.file: add file.mkdir to unit test mock 2015-12-08 16:33:33 -07:00
Justin Findlay
aa393a4831 state.file: add pchanges to unit test mock 2015-12-08 16:33:07 -07:00
Kris Raney
591e2756cc Add tests for boto_lambda states. 2015-12-08 16:20:31 -06:00
Colton Myers
7918736656 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/client/ssh/ssh_py_shim.py
    salt/modules/dracr.py
    salt/states/boto_vpc.py
    tests/unit/states/file_test.py
2015-12-08 14:46:23 -07:00
Colton Myers
e59364ad1d Fix failing unit test 2015-12-08 13:45:34 -07:00
Kris Raney
bda53f74a4 Full unit test coverage for lambda module 2015-12-08 13:33:28 -06:00
Andreas Lutro
36e493cadf lint - tabs to spaces, oops 2015-12-08 20:24:45 +01:00
Colton Myers
9673fd0937 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/cloud/clouds/ec2.py
    tests/unit/states/file_test.py
2015-12-08 12:23:26 -07:00
Kris Raney
f98791054e Lambda function unit test cases 2015-12-08 10:15:11 -06:00
Mike Place
95523312a0 Merge pull request #29512 from dr4Ke/fix_remount_cifs_uid_name
Fix forced remount if uid/gid is provided as a name
2015-12-08 09:08:33 -07:00
Christophe Drevet-Droguet
9a268e05d6 mount exec module: resolve user/group names in opts
In relation to #25293, it solves the improbable case where the OS returns the
mount options as names instead of numeric ids. The module converts these names
to numeric ids before returning the opts.

This is done only for uid= and gid= opts, for now. It can be extended to others.
2015-12-08 12:43:47 +01:00
Christophe Drevet-Droguet
7395a949e4 mount state module: uid/gid verification with names
Should fix #25293
2015-12-08 12:43:46 +01:00
Mike Place
87fb8baad1 Merge pull request #29294 from skizunov/develop2
ZeroMQ no longer required when transport is TCP
2015-12-07 21:59:44 -07:00
Nicole Thomas
df90c406ba Merge pull request #29462 from techhat/genesispart
Create partitioned, bootable images
2015-12-07 19:28:24 -07:00
Sergey Kizunov
a37a2700af ZeroMQ no longer required when transport is TCP
salt/master.py:
- If ZMQ is not importable, use `tornado.ioloop.IOLoop` as the loop class.
- Check HAS_ZMQ before using any zmq.* content.
- Did not touch `FloMWorker` usage of zmq.*. This is only used when the
transport is RAET.

salt/minion.py:
- If ZMQ is not importable, use `tornado.ioloop.IOLoop` as the loop class.
- Check HAS_ZMQ before using any zmq.* content.

salt/transport/ipc.py:
- Added `IPCMessagePublisher`. This is intended to function much like
ZMQ's zmq.PUB sockets. Used in implementing utils/event.py to function
without ZMQ.
- Added `IPCMessageSubscriber`. This is intended to function much like
ZMQ's zmq.SUB sockets. Used in implementing utils/event.py to function
without ZMQ. What makes this class a bit different is that the associated
IO Loop is meant to not be running when it is used. Due to this, it is
recommended that the caller create a new IO Loop for this purpose. The
reason for this is that the `get_event()` API may be invoked from
anywhere, whether or not there is a current IO Loop that is running in
the thread of the invocation.

salt/utils/async.py:
- If ZMQ is not importable, use `tornado.ioloop.IOLoop` as the loop class.

salt/utils/event.py:
- Implemented using `salt.transport.ipc` instead of ZMQ.
- zmq.PUB ==> `IPCMessagePublisher`
- zmq.SUB ==> `IPCMessageSubscriber`
- zmq.PUSH ==> `IPCMessageClient`
- zmq.PULL ==> `IPCMessageServer`

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-12-07 20:22:16 -06:00
Justin Findlay
99b229c9fe modules.genesis: update unit tests for bootstrap 2015-12-07 15:19:22 -07:00
Andreas Lutro
edf2a3098e remove "2" from state name 2015-12-07 21:54:16 +01:00
Andreas Lutro
00b6eb5907 add tests, clean up/fix logic 2015-12-07 21:52:22 +01:00
Mike Place
7efd6dd140 Merge pull request #29399 from jfindlay/second_up
modules.status: add human_readable option to uptime
2015-12-07 12:53:52 -07:00
Joseph Hall
bb6e2d5a8a Adding tests for disk.blkid 2015-12-07 08:52:06 -07:00
Christophe Drevet-Droguet
4a00cc5b70 cron: support for commented cron jobs
This change is an implementation for managing commented cron jobs.

Before that, commented cron jobs were not manageable by salt. They were ignored
at reading, and thus lost while writing the new crontab.
This is described in issue #29082, which should be fixed now.

There is a new `commented` parameter, defaulting to False. The cron job is
set like any other, but is prefixed by `#DISABLED#`.
2015-12-07 15:40:36 +01:00