Commit Graph

62378 Commits

Author SHA1 Message Date
Petr Messner
9e5c16d4da Reading S3 credentials from Pillar 2015-11-18 09:09:09 -07:00
Petr Messner
a3216f813d Fixed requests HTTPError handler, it was still in urllib2 style 2015-11-18 09:09:09 -07:00
makearl
9ccd0b2d4c Add support for beacon config as a list 2015-11-18 09:20:23 -06:00
Frederic Crozat
2a2c69d77c Fix deployment when umask is non-standard. Fixes #29005 2015-11-18 15:24:29 +01:00
Lukas Braun
984a076d9a systemd.py: stat before iterating over known units
A stat is cheap and most units don't reside in /etc/systemd so the
expensive operation of gathering all known units and iterating over them
can be avoided.
2015-11-18 15:20:19 +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
Mathieu Le Marec - Pasquet
a4d197821a LXC: doc 2015-11-18 13:34:56 +01:00
Mathieu Le Marec - Pasquet
43fb0eff02 lxc: remove useless and error prone uses_systemd knob 2015-11-18 13:34:53 +01: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
Mathieu Le Marec - Pasquet
7ec08cd41c Fix bootstrap delay kwarg exchange
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-11-18 13:08:20 +01: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
Colton Myers
ac85cfdbd0 Merge pull request #28983 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-17 17:49:36 -07:00
Colton Myers
1a4cd6002f Merge pull request #28982 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2015-11-17 17:49:32 -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
Colton Myers
f1c80ab943 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/utils/schedule.py
2015-11-17 16:18:12 -07:00
Colton Myers
bfbb109fbd Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5
Conflicts:
    salt/fileclient.py
2015-11-17 16:15:48 -07:00
C. R. Oldham
04095e3b74 Prevent stacktrace if something goes wrong retrieving inventory 2015-11-17 15:39:57 -07:00
Kris Raney
a6431f1293 Limit protocol range
This will accept positive integers up thru 255
2015-11-17 16:33:18 -06:00
C. R. Oldham
e7cbce15a5 Don't need to get grains at init time here now that we are confirming username and password differently. 2015-11-17 15:26:09 -07:00
C. R. Oldham
e42100cf8a Switch from admin_password and fallback_admin_password to a list of passwords to try. 2015-11-17 15:20:55 -07: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
Mark McGuire
b8843162b4 index string formatting for python2.6 2015-11-17 14:17:50 -06:00
Erik Johnson
ec64ec85d6 Force file_roots environments to be strings 2015-11-17 14:15:36 -06:00
Erik Johnson
b2690140c7 Properly handle non-string saltenvs
Force the saltenv to be a string, preventing AttributeError exceptions
in the various backends if someone passes an int/float as a saltenv.

Fixes #28911.
2015-11-17 14:15:36 -06: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
C. R. Oldham
4b382e977d Add 'versionadded' 2015-11-17 11:57:26 -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
Mark McGuire
7fbb0ac40f add versionadded 2015-11-17 11:55:08 -06: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
rallytime
3614a88811 Add blade password example and make note of timeout
Fixes #28945
2015-11-17 10:13:24 -07:00
Mark McGuire
64e01f8e5a don't force utf-8 for configparser serializer 2015-11-17 11:06:55 -06:00
Mark McGuire
f0a60b33e2 Use changes in #28926 2015-11-17 10:54:19 -06:00
Mark McGuire
be2751885d Merge remote-tracking branch 'origin/develop' into configparser-serializer 2015-11-17 10:26:09 -06:00