Commit Graph

59003 Commits

Author SHA1 Message Date
Mike Place
356bf2987d Merge pull request #28764 from multani/fix/docs
Various documentation fixes
2015-11-11 09:06:09 -07:00
Jonathan Ballet
1a31b69763 doc: fix documentation formatting in salt.utils.jinja 2015-11-11 12:01:10 +01:00
Jonathan Ballet
59c105b4b9 doc: fix documentation formatting in salt.states.boto_iam* 2015-11-11 12:00:59 +01:00
Jonathan Ballet
cbb167c8ee doc: fix documentation formatting in in salt.modules.lxc 2015-11-11 12:00:17 +01:00
Jonathan Ballet
cb03a89e52 doc: fix documentation formatting in salt.modules.aptpkg 2015-11-11 12:00:08 +01:00
Justin Findlay
d77c24e70d Merge pull request #28752 from aboe76/suse_tumbleweed_grain
Update openSUSE grain for tumbleweed
2015-11-10 20:54:37 -07:00
Justin Findlay
a620bc5596 Merge pull request #28713 from hexedpackets/fix-consul-module
Rename consul.list to consul.list_keys.
2015-11-10 17:57:23 -07:00
Niels Abspoel
764cb16ef0 Update openSUSE grain for tumbleweed
After discussion with Richard Brown from Opensuse,
Added openSUSE Tumbleweed grain for future release

As it stands the following distributions of Suse are:
openSUSE Leap
openSUSE Tumbleweed
openSUSE (numbered releases)
SLES (Suse Linux Enterprise Server)
SLED (Suse Linux Enterprise Desktop)

For reference see:
https://bugzilla.suse.com/show_bug.cgi?id=954135
2015-11-10 20:02:18 +01:00
William Huba
0889907b3c Make consul.list a function alias.
Fixes #28712.
2015-11-10 10:25:17 -05:00
jacobhammons
decc31a766 Merge pull request #28719 from jacobhammons/spm
removed dependencies info from docs
2015-11-09 17:04:53 -07:00
Colton Myers
989069f44a Merge pull request #28709 from basepi/merge-forward-2015.8
[2015.8] Merge forward from 2015.5 to 2015.8
2015-11-09 16:38:27 -07:00
Jacob Hammons
d7017be031 removed dependencies info from docs 2015-11-09 16:07:17 -07:00
Mike Place
8d5ab15c16 Merge pull request #28710 from rallytime/fix-28469
Pass kwargs correctly to _get_group from get_group_id
2015-11-09 15:29:09 -07:00
Colton Myers
2d04ddc108 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-11-09 15:28:14 -07:00
Colton Myers
c90431eddc Rip out unit test that doesn't apply anymore
We now use -q with the command so we don't have to test our ability to
strip "Listing vhosts" out of the test
2015-11-09 15:22:01 -07:00
rallytime
0571608f5d Pass kwargs correctly to _get_group from get_group_id
Fixes #28469
2015-11-09 12:34:36 -07:00
Pedro Algarvio
f40c617bad Merge pull request #28705 from cachedout/tornado_http_headers
Account for new headers class in tornado 4.3
2015-11-09 19:24:33 +00:00
Colton Myers
aeeaa7c90d Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/config.py
    salt/minion.py
    salt/pillar/s3.py
2015-11-09 12:12:24 -07:00
Mike Place
cfa0cec19c Merge pull request #28698 from rallytime/bp-28530
Back-port #28530 to 2015.8
2015-11-09 11:11:51 -07:00
Mike Place
604a7b4199 Merge pull request #28699 from rallytime/bp-28670
Back-port #28670 to 2015.5
2015-11-09 11:10:58 -07:00
Mike Place
2fe9e2e7c5 Merge pull request #28700 from rallytime/bp-28679
Back-port #28679 to 2015.8
2015-11-09 11:07:44 -07:00
Mike Place
7bd3eb8370 Merge pull request #28703 from rallytime/bp-28690
Back-port #28690 to 2015.5
2015-11-09 11:01:57 -07:00
Mike Place
7ac6cde1ee Account for new headers class in tornado 4.3
This started to fail with the test:  integration.netapi.rest_tornado.test_app.TestWebhookSaltAPIHandler.test_post

This happened with the introduction of Tornado 4.3 wherein headers were delivered as a subclass of a python dict, called HTTPHeaders http://www.tornadoweb.org/en/stable/releases/v4.3.0.html

This in turn caused msgpack serialization errors as we couldn't figure out how to serialize the new class. (Somewhat ironically, since the upstream change was made to better support serialization, but c'est la vie). Instead of trying to give hints to our serialialization lib, it seemed more sensible just to cast this back into a python dictionary before we put it onto the event bus.

Tested against tornado 4.3 and 4.2
2015-11-09 10:56:12 -07:00
Nicole Thomas
8ccea2a855 Merge pull request #28695 from s0undt3ch/2015.8
[2015.8] Update to latest bootstrap script v2015.11.09
2015-11-09 10:50:15 -07:00
Nicole Thomas
2a40f57b93 Merge pull request #28694 from s0undt3ch/2015.5
[2015.5] Update to latest bootstrap script v2015.11.09
2015-11-09 10:49:53 -07:00
Metin OSMAN
a0988dab58 Fix 28689 : Check s3 ext pillar cache file before calculating expiration 2015-11-09 10:21:50 -07:00
Johnson
4e0870e636 Adding variable definition for issue #28678 2015-11-09 09:50:21 -07:00
Thayne Harbaugh
e436b23296 psutil can fail to look-up a uid and raise a KeyError 2015-11-09 09:48:58 -07:00
Sergey Kizunov
d94d0db805 AsyncTCPReqChannel will fail after 10 uses
The issue is that the resolver that is used
(tornado.netutil.ThreadedResolver) is shared. Threads don't seem to be
returned for reuse until 'close' is invoked on the resolver. Due to
this, sharing the same Resolver object may not be a good idea. Instead,
we will configure which resolver type will be used
(tornado.netutil.ThreadedResolver) as well as the number of threads.
We will let 'tornado.tcpclient.TCPClient' create its own resolver
object (by effectively passing resolver=None). This object will pull
from the shared thread pool, but since it will be closed when
'tornado.tcpclient.TCPClient' is closed, it will return threads back to
the thread pool for later use.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2015-11-09 09:47:17 -07:00
Pedro Algarvio
bb6c60a330 Update to latest bootstrap script v2015.11.09
* Make sure that wget is installed. saltstack/salt-bootstrap#868
2015-11-09 16:30:48 +00:00
Pedro Algarvio
0910c6ffe4 Update to latest bootstrap script v2015.11.09
* Make sure that wget is installed. saltstack/salt-bootstrap#868
2015-11-09 16:29:45 +00:00
Erik Johnson
61ba00b1c3 Merge pull request #28656 from clarkperkins/bugfix/fix-yumpkg-module
#28526 fixed yumpkg module issue with pkg.installed
2015-11-08 23:16:00 -06:00
Mike Place
3249b322e8 Merge pull request #28669 from rallytime/fix-26592
Use the -q argument to strip extraneous messages from rabbitmq
2015-11-07 18:07:25 -07:00
Mike Place
54484e4e29 Merge pull request #28672 from jfindlay/suse_grain
add OS grain support for SuSE Leap
2015-11-07 18:05:51 -07:00
Mike Place
476f55ebc0 Merge pull request #28673 from jfindlay/mount_hide
add hidden_opts to mount.mounted
2015-11-07 17:51:19 -07:00
Justin Findlay
1dcaa8e1d7 add hidden_opts to mount.mounted
Fixes #28603.
2015-11-07 00:07:20 -07:00
Justin Findlay
d3aff8f6b8 minor refactor of mount state 2015-11-06 23:29:23 -07:00
Justin Findlay
b44ba6fa9c add OS grain support for SuSE Leap
Fixes #28588.
2015-11-06 22:40:26 -07:00
Mike Place
29e8250d0c Merge pull request #28645 from jacksontj/2015.5
Rework minion return_retry_timer
2015-11-06 20:40:28 -07:00
Mike Place
1bbaea8aad Merge pull request #28668 from twangboy/fix_15177
Fixed join_domain and unjoin_domain for Windows
2015-11-06 20:40:04 -07:00
Thomas Jackson
f63c2d70a7 Rework minion return_retry_timer
This feature originally would randomize between 1 -> return_retry_timer, which meant you could always had the possibility of haing a return retry with a timeout of 1s. This change maxes both ends of the range configurable (similar to how acceptance_wait_time is configured). In addition I've added coverage in the minion configuration documentation.

Cleanup of #27286
Fixes #28577
2015-11-06 18:05:45 -08:00
Mike Place
24d75709fa Merge pull request #28667 from cro/proxy_sync_all
saltutil.sync_all should sync proxymodules as well as the rest.
2015-11-06 18:09:28 -07:00
Mike Place
019c13948a Merge pull request #28665 from jfindlay/win_fixorz
fixes to windows execution and state modules
2015-11-06 17:47:38 -07:00
Mike Place
4ad5056066 Merge pull request #28666 from jfindlay/r_data
define r_data before using it in file module
2015-11-06 17:46:26 -07:00
Mike Place
e129e889ad Merge pull request #28662 from cachedout/issue_24758
Add note about disabling master_alive_interval
2015-11-06 17:38:12 -07:00
twangboy
745b8f75f6 Fixed some lint 2015-11-06 17:30:31 -07:00
rallytime
098fb815af Use the -q argument to strip extraneous messages from rabbitmq
Instead of trying to do it ourselves and worrying about which
version prints 'Listing vhosts...' and '...done' at the beginning
or end of the output or not.

Fixes #26592
2015-11-06 17:20:10 -07:00
twangboy
a43eb53f28 Added version added notes in docs 2015-11-06 17:12:19 -07:00
twangboy
6b537c8640 Fixed join_domain and unjoin_domain for Windows
Fixes #15177

Uses WMI instead of win32net
Added restart parameter
Seperated out error definitions into their own function
Added default workgroup to change to on unjoin
Added additional examples
Added additional parameter checking
Added function to get current domain or workgroup
2015-11-06 17:06:11 -07:00
C. R. Oldham
08e53b317f Sync proxymodules with sync_all 2015-11-06 16:11:26 -07:00