Commit Graph

62048 Commits

Author SHA1 Message Date
Mike Place
b5a92a5fc3 Pack log handlers with grains and mods
Refs #28999
2015-11-19 13:07:30 -07:00
Mike Place
b1b6c8d416 Merge pull request #28958 from jfindlay/gecos_comma
user.present state: rework to use six.string_types
2015-11-18 12:38:34 -07:00
Mike Place
be6081999a Merge pull request #29016 from cachedout/serializers_lint
Adding new dunders to pylintrcs
2015-11-18 12:35:04 -07:00
Mike Place
7e540e2c35 Adding new dunders to pylintrcs
Make __serializers__ known to pylint. Refs #28926 and #28906
2015-11-18 11:39:23 -07:00
Mike Place
b386bfa59d Merge pull request #28952 from rominf/hg_status_multiple_repos
[modules/hg] hg.status: multiple repositories
2015-11-18 11:35:29 -07:00
Mike Place
b9118f6446 Merge pull request #28962 from quantonganh/boto-ec2-network
Boto ec2 network
2015-11-18 11:20:19 -07:00
Mike Place
8afb0dfa9a Merge pull request #28988 from anitakrueger/postgres-cluster-absent-stop
Stop postgres cluster by default when trying to remove it via postgres_cluster.absent
2015-11-18 11:16:28 -07:00
Mike Place
246fa4160e Merge pull request #29013 from mscherer/add_check_yumrepo
Verify that there is no conflict of keyword
2015-11-18 11:04:27 -07:00
Colton Myers
0456527fc1 Merge pull request #29006 from fcrozat/develop
Fix deployment when umask is non-standard. Fixes #29005
2015-11-18 11:04:16 -07:00
Mike Place
a9624a3dda Merge pull request #28992 from notpeter/brewfix
Homebrew oneliner fix.
2015-11-18 11:01:10 -07:00
Mike Place
4eb5ac420c Merge pull request #28980 from kraney/kraney-patch-1
Allow custom protocols in boto_secgroup state
2015-11-18 10:59:51 -07:00
Mike Place
30d1c7ec09 Merge pull request #29002 from s0undt3ch/issues/28893-conflict-parser-option
Fix #28893 conflict parser option + Some daemon support goodies
2015-11-18 10:57:01 -07:00
Mike Place
a3636de064 Merge pull request #28989 from twangboy/dsc_edit_2
Dsc edit 2
2015-11-18 10:10:27 -07:00
Michael Scherer
90737b63d1 Verify that there is no conflict of keyword
Since key_url and keyid are incompatible, it should
be check so we do not end with a incorrect expectation
from users.
2015-11-18 18:01:21 +01:00
Pedro Algarvio
6e574d92c3 Add missing import 2015-11-18 16:27:37 +00:00
Pedro Algarvio
8a04daeb1f Can't just rename run() to start(). Deprecate run(). 2015-11-18 16:26:45 +00:00
Frederic Crozat
2a2c69d77c Fix deployment when umask is non-standard. Fixes #29005 2015-11-18 15:24:29 +01:00
Pedro Algarvio
fb3c8be32b Merge pull request #28979 from cachedout/broaden_exception_in_version
Better handling for broken modules in salt versions report
2015-11-18 12:43:21 +00:00
Pedro Algarvio
641261aa3f Proper signal handling to the salt-api daemon 2015-11-18 12:23:51 +00:00
Pedro Algarvio
1195a2e1b7 Rename logger to log since that's what's used throughout Salt's code 2015-11-18 12:16:45 +00:00
Pedro Algarvio
03747dd2cc Turn salt.cli.api.SaltAPI code into proper daemon code 2015-11-18 12:10:52 +00:00
Pedro Algarvio
9bd7423b50 Stop using the deprecated mixin 2015-11-18 12:01:18 +00:00
Pedro Algarvio
7ec3c266a4 Make PidfileMixin not override the DaemonMixin methods 2015-11-18 12:00:30 +00:00
Pedro Algarvio
99c3396451 Parser code should live in salt.utils.parsers 2015-11-18 11:49:45 +00:00
Peter Tripp
bc8c3724fd Homebrew oneliner fix. 2015-11-17 22:30:51 -08:00
Colton Myers
7550f7a30a Merge pull request #28984 from basepi/merge-forward-develop
Merge forward from 2015.8 to develop
2015-11-17 17:49:40 -07:00
twangboy
c54ca65ced Added documentation to the new functions 2015-11-17 17:48:15 -07:00
twangboy
1cce3eb1d8 Additional Functionality
Added the following functions:
- run_config
- test_config
- get_config
- get_config_status
2015-11-17 17:37:50 -07:00
Anita Krueger
52d3b1baac When a postgres cluster is to be removed, the user doesn't know if it's running or not. Mostly, the cluster will be running. So stop it by default.
If that is not desired behavior, then an option to stop it needs to be added, because otherwise a running cluster can never be removed.
2015-11-18 00:12:54 +00:00
Colton Myers
d76d62877d Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/modules/git.py
    salt/renderers/gpg.py
    salt/utils/__init__.py
2015-11-17 16:24:43 -07:00
Kris Raney
a6431f1293 Limit protocol range
This will accept positive integers up thru 255
2015-11-17 16:33:18 -06:00
Kris Raney
1461a87d1d Allow for custom protocols specified as numbers.
For example, GRE is IP protocol 47.
2015-11-17 16:20:45 -06:00
Mike Place
a8cdf1c76d Better handling for broken modules in salt versions report
Modules can throw all kinds of exceptions on import, not just importerror. This prevents a hard stacktrace.
2015-11-17 14:53:44 -07:00
Mike Place
4cb07cf997 Merge pull request #28941 from dmyerscough/Fix-custom-api-endpoint
Fix custom api endpoint
2015-11-17 14:37:48 -07:00
Mike Place
f172a0ee03 Merge pull request #28969 from rallytime/bp-28825
Back-port #28825 to 2015.8
2015-11-17 13:43:30 -07:00
Mike Place
4df29152b9 Merge pull request #28964 from skizunov/develop2
TCP transport minion errors when deep-copying `RemoteClient`
2015-11-17 13:25:13 -07:00
Pedro Algarvio
40f4ac5b21 Add missing import 2015-11-17 13:07:06 -07:00
Pedro Algarvio
2c43da1578 Take into account a pygit2 bug 2015-11-17 13:07:06 -07:00
Sergey Kizunov
f122f08bda TCP transport minion errors when deep-copying salt.fileclient.RemoteClient
There is code that tried to deep-copy `salt.fileclient.RemoteClient` and
fails. The callstack below shows this occurring.
This change makes `RemoteClient` picklable so that it may be deep copied.
It requires this because its constructor requires an `opt` parameter.

The error looks like this:

[ERROR   ] Exception in callback (1260L, <function wrapped at 0x0000000007434828
>)
Traceback (most recent call last):
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\site-packages\
tornado\ioloop.py", line 866, in start
    handler_func(fd_obj, events)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\site-packages\
tornado\stack_context.py", line 343, in wrapped
    raise_exc_info(exc)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\site-packages\
tornado\stack_context.py", line 304, in wrapped
    n.enter()
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\site-packages\
tornado\stack_context.py", line 118, in enter
    context = self.context_factory()
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\site-packages\
salt\minion.py", line 1012, in ctx
    self.functions.context_dict.clone(),
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\site-packages\
salt\utils\context.py", line 92, in clone
    child = ChildContextDict(parent=self, overrides=kwargs)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\site-packages\
salt\utils\context.py", line 137, in __init__
    self._data[k] = copy.deepcopy(v)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 163, in deepcopy
    y = copier(x, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 257, in _deepcopy_dict
    y[deepcopy(key, memo)] = deepcopy(value, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 190, in deepcopy
    y = _reconstruct(x, rv, 1, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 334, in _reconstruct
    state = deepcopy(state, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 163, in deepcopy
    y = copier(x, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 257, in _deepcopy_dict
    y[deepcopy(key, memo)] = deepcopy(value, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 190, in deepcopy
    y = _reconstruct(x, rv, 1, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 334, in _reconstruct
    state = deepcopy(state, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 163, in deepcopy
    y = copier(x, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 257, in _deepcopy_dict
    y[deepcopy(key, memo)] = deepcopy(value, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 190, in deepcopy
    y = _reconstruct(x, rv, 1, memo)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy.py", line
 329, in _reconstruct
    y = callable(*args)
  File "C:\Program Files\National Instruments\Shared\salt\bin\lib\copy_reg.py",
line 93, in __newobj__
    return cls.__new__(cls, *args)
TypeError: __new__() takes exactly 2 arguments (1 given)
Exception RuntimeError: RuntimeError('maximum recursion depth exceeded while cal
ling a Python object',) in <bound method SyncWrapper.__del__ of <salt.utils.asyn
c.SyncWrapper object at 0x00000000051ACB00>> ignored
Exception RuntimeError: RuntimeError('maximum recursion depth exceeded while cal
ling a Python object',) in <bound method SyncWrapper.__del__ of <salt.utils.asyn
c.SyncWrapper object at 0x00000000051ACB00>> ignored

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-11-17 12:21:00 -06:00
twangboy
657f5ef40a Additional Functionality
Added the following functions:
- run_config
- test_config
- get_config
- get_config_status
2015-11-17 11:20:51 -07:00
Quan Tong Anh
f5c2b4fd52 boto_ec2: fix example in the attach_network_interface() function 2015-11-18 00:59:55 +07:00
Quan Tong Anh
0049b54240 boto_ec2: support instance_name when attach a network interface 2015-11-18 00:59:55 +07:00
Mike Place
d4698e4985 Merge pull request #28936 from skizunov/develop2
Windows salt-master failures due to passing 'log_queue'
2015-11-17 10:50:39 -07:00
Justin Findlay
f8ed57cd6d user.present state: rework to use six.string_types
As suggested by
https://github.com/saltstack/salt/pull/28849/files#r44928354.
2015-11-17 09:21:40 -07:00
Roman Inflianskas
ded2d46663 [modules/hg] hg.status: multiple repositories 2015-11-17 19:05:57 +03:00
Mike Place
1e9214f4e4 Merge pull request #28787 from chrigl/fix-28784
closes #28784
2015-11-17 08:54:04 -07:00
Sergey Kizunov
ebc3b738b6 Passing in log_queue explicitly instead of using **kwargs
salt/utils/process.py:
- Since `log_queue` is now passed in explicitly, it now may exist with a
value of `None`. `MultiprocessingProcess.__init__` has been modified to
handle this case.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-11-17 09:51:39 -06:00
Damian Myerscough
8cd8415652 Missing comma 2015-11-17 07:50:02 -08:00
Mike Place
b387e3c25e Merge pull request #28955 from Michael-S/develop
Fix index off by one bug in debug log statement.
2015-11-17 08:47:26 -07:00
Mike Place
5e277492d8 Merge pull request #28939 from quantonganh/boto-ec2-eip
Boto ec2 eip
2015-11-17 08:46:49 -07:00