Commit Graph

61437 Commits

Author SHA1 Message Date
Scott Walton
540305dc99 Added test and fix for #28608. 2015-11-06 09:06:07 +00:00
Pedro Algarvio
a30acf17c6 Merge pull request #28628 from cachedout/catch_shutdown_error
Catch a possible error on shutdown
2015-11-05 23:45:46 +00:00
Mike Place
81396927f8 Merge pull request #28605 from zigarn/a2xxconf
Improvements on Debian-style apache utilities a2(en|dis)(mode|site|conf)
2015-11-05 15:18:28 -07:00
Mike Place
f20b877e2d Merge pull request #28626 from sjorge/doc-fixes
small spelling errors in docs for salt.states.x509
2015-11-05 15:13:33 -07:00
Mike Place
2083eee7f7 Catch a possible error on shutdown
Catches a condition where our exception handler might itself raise
an exception on shutdown.
2015-11-05 15:12:11 -07:00
Nicole Thomas
b5a89927f0 Merge pull request #28594 from rallytime/merge-develop
Merge branch '2015.8' into develop
2015-11-05 14:47:42 -07:00
Nicole Thomas
62e8f1bfcd Merge pull request #28624 from hyn-salt/patch-1
Added reasoning why boto_cloudwatch.py cannot be loaded.
2015-11-05 14:47:06 -07:00
Jorge Schrauwen
3a2719213c small spelling errors in docs for salt.states.x509 2015-11-05 21:33:08 +00:00
Mike Place
64e881e634 Merge pull request #28614 from skizunov/develop2
Fixed memory leak in AsyncTCPReqChannel
2015-11-05 14:16:25 -07:00
Keith
573ae5e2b6 Added reasoning why boto_cloudwatch.py cannot be loaded. 2015-11-05 14:10:25 -07:00
Sergey Kizunov
cb326f06da Fixed memory leak in AsyncTCPReqChannel
`cls.instance_map` was growing unbounded. This was because
`io_loop.close()` was invoked before `stream.close()`. The stategy used
to fix this issue was discussed in pull request #28530 and can be
summarized as follows:

The `close()` method on the async object will be called if it exists.
This will be called before the `io_loop.close()` to give the async object
the opportunity to close its stream. The del of the async object will
continue to happen after io_loop.close(). This is to maintain the fix
from pull request #27343.

Per file change details:
salt/utils/async.py:
- Implemented the close logic described above.

salt/transport/ipc.py:
- Ensured that `close()` may be invoked more than once safely.
- In IPCServer, `self.stream` was never actually used. Removed
references to it to avoid confusion.

salt/transport/zeromq.py:
- Ensured that `close()` may be invoked more than once safely.

salt/transport/tcp.py:
- Ensured that `close()` may be invoked more than once safely.
- Changed `destroy()` methods to `close()` methods since they involved
a stream that should be closed before `io_loop.close()`.
- In SaltMessageClient, added more checks for `self._closing`. This
makes exit cleaner by not attempting to reconnect while closing.
- Removed the code associate with pull request #28113. This code is
no longer needed now that the stream is closed before the io_loop.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-11-05 12:28:18 -06:00
Alexandre Garnier
f505b51ab1 Add module and state wrappers on a2enconf/a2disconf 2015-11-05 19:07:14 +01:00
Mike Place
36b35899ea Merge pull request #28609 from sjorge/smartos_vmadm_cleanup
cleanup smartos_imgadm and more cleanup of smartos_vmadm
2015-11-05 10:48:30 -07:00
rallytime
62d688d720 Fix mock patch module name 2015-11-05 10:45:30 -07:00
rallytime
3bcd068f6a Update cloud vmware unittests to utilize the salt.utils.vmware.py file 2015-11-05 10:02:05 -07:00
Alexandre Garnier
2e6cf66d80 Add apache_site state (like apache_module)
Allow to enable/disable Debian-style sites with `a2ensite`/`a2dissite`.
2015-11-05 17:52:42 +01:00
Alexandre Garnier
39e1e6448b Simplify deb_apache.check_mod_enabled
There is no 'default' with '000-' prefix for modules.
(Looks like a copy/paste from `check_site_enabled`)
2015-11-05 17:52:42 +01:00
Jorge Schrauwen
f77a007408 improve documentation 2015-11-05 16:26:04 +00:00
Jorge Schrauwen
79398ebdab let salt do some of the work, less code is better also for imgadm 2015-11-05 16:23:06 +00:00
Jorge Schrauwen
376965949f let salt do some of the work, less code is better 2015-11-05 16:15:44 +00:00
Mike Place
9a08e4c1dd Merge pull request #28562 from jirikotlin/develop
Test True support for INI state module.
2015-11-05 09:01:50 -07:00
Mike Place
4855964681 Merge pull request #28598 from s0undt3ch/hotfix/pidfile-might-not-exist
Make DaemonMixin subclass PidfileMixin and move check_running to DaemonMixin
2015-11-05 09:00:31 -07:00
rallytime
718d3e39ac Be explicit about salt.utils.vmware function calls and avoid namespacing 2015-11-05 08:02:09 -07:00
Jiri Kotlin
eb19140cc5 INI test compliancy - modified ini_manage_test.py 2015-11-05 13:49:05 +00:00
Pedro Algarvio
7143bb256d No need to move PidfileMixin 2015-11-05 12:30:48 +00:00
Pedro Algarvio
3a44ebe3c3 Fix variable name and Lint fixes 2015-11-05 12:26:57 +00:00
Pedro Algarvio
77ab2831fc Minor cosmetic fix 2015-11-05 12:23:27 +00:00
Pedro Algarvio
e635e9b88a Deprecate PidfileMixin 2015-11-05 00:54:37 +00:00
Pedro Algarvio
69b553c245 Make sure we clean up pidfiles on exit 2015-11-05 00:42:57 +00:00
Pedro Algarvio
2d15bb3250 Make DaemonMixin subclass PidfileMixin and move check_running to DaemonMixin
The pidfile and daemon mixins only make sense together, so, they are now
one and only DaemonMixin needs to be passed as a subclass. Additionally,
it only makes sense that a parser inheriting from DaemonMixin needs to have
access to `check_running`, not just a subset of our daemons.

PidfileMixin is left for backwards compat.
2015-11-05 00:23:52 +00:00
rallytime
f2ac256209 Clean up vmware.py missing function references leftover from merge-forward 2015-11-04 15:41:23 -07:00
rallytime
d31b0d1573 Merge branch '2015.8' into develop 2015-11-04 15:40:03 -07:00
Mike Place
f7d46c32d7 Merge pull request #28530 from skizunov/develop2
AsyncTCPReqChannel will fail after 10 uses
2015-11-04 15:02:11 -07:00
Mike Place
3c01d98177 Merge pull request #28575 from BuildOps/ssh-cli-sudo-option
Add --sudo option to salt-ssh CLI.
2015-11-04 15:00:49 -07:00
Mike Place
8b483ee354 Merge pull request #28578 from twangboy/fix_windows_installer_script
Fixed the script... something got broke...
2015-11-04 15:00:18 -07:00
Mike Place
7ca7ed4b37 Merge pull request #28579 from jfindlay/virt_ret
fix __virtual__ returns: tls,uptime mods
2015-11-04 15:00:02 -07:00
Mike Place
ae764c6b5c Merge pull request #28584 from rallytime/fix-27574
If AssociatePublicIpAddress is set to True, don't auto-assign eip.
2015-11-04 14:59:38 -07:00
Mike Place
231cdd4316 Merge pull request #28576 from jacksontj/transport
Only encode the zmq message once
2015-11-04 14:59:20 -07:00
Mike Place
c4c6e3cd86 Merge pull request #28590 from cachedout/postgres_test
Re-merge"[modules/postgres] quote identifiers in SQL""
2015-11-04 14:52:30 -07:00
Mike Place
82c1fb21ba Revert "Revert "[modules/postgres] quote identifiers in SQL""
This reverts commit b9761df008.
2015-11-04 14:51:56 -07:00
Colton Myers
ab62f5cd12 Merge pull request #28587 from cachedout/fix_yaml_render_leak
Reset yaml rendering hooks to avoid leaks
2015-11-04 14:37:11 -07:00
Mike Place
2da64bd736 Reset yaml rendering hooks to avoid leaks
So, this is an unusual problem. The issue was the with the introduction of an ordereredict representer to the yaml renderer inside the grains module, it was staying bound even outside of that module. This ends up breaking some types of rendering for anything that calls either safe_load or safe_dump after the ordereddict representer was attached.

I experimented a bunch with trying to centralize this inside the salt.serializers.yaml class. At the end of the day, it ended up adding a bunch of overhead and tracking to that module and made it fairly dirty just to handle a one-off case. If this becomes a problem in the future, I feel like we can revisit it then.

I also experimented with trying to create special yaml subclasses with yaml serialization hints inside them. While this worked fine for serialization, it's not supported in the pyyaml safe deserialization methods and so that approach was abandoned.

This should fix the failing serializer tests in 2015.8 and develop.
2015-11-04 13:54:32 -07:00
Justin Findlay
333c132378 fix __virtual__ returns: tls,uptime mods 2015-11-04 13:10:38 -07:00
rallytime
490e1bd5bb If AssociatePublicIpAddress is set to True, don't auto-assign eip.
Fixes #27574
2015-11-04 12:46:24 -07:00
Colton Myers
69081d00e0 Merge pull request #28581 from saltstack/revert-28134-2015.8
Revert b4875e585a
2015-11-04 12:28:20 -07:00
Colton Myers
0a07c90d5e Revert b4875e585a 2015-11-04 11:53:59 -07:00
twangboy
90b19a3279 Fixed the script... something got broke... 2015-11-04 10:53:10 -07:00
Erik Johnson
ea3658eac8 Merge pull request #28573 from jacksontj/2015.8
Add `body` to salt.utils.http.query returns
2015-11-04 11:18:19 -06:00
Thomas Jackson
b29fc676a3 Only encode the zmq message once
With #28410 I failed to notice that I would re-encode on every retry. This fixes that :)
2015-11-04 09:06:28 -08:00
Rob van Oostrum
8ac99c4155 Add --sudo option to salt-ssh CLI. Solves #28574 2015-11-04 11:42:08 -05:00