valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
61,569 Commits 24 Branches 182 Tags 341 MiB
fbaeb165c9
Commit Graph

61569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
fbaeb165c9 Merge branch '2015.5' into merge-2015.8 
No conflicts.
 2016-04-13 09:07:39 -06:00
Nicole Thomas
7307bcb88e Merge pull request #32538 from rallytime/bp-32528 
Back-port #32528 to 2015.5
 2016-04-13 09:06:14 -06:00
rallytime
46a4e8a310 Remove merge conflict line 2016-04-13 09:05:31 -06:00
Andrew Pashkin
e0d947c707 Document "grains" setting in the minion configuration reference 2016-04-13 08:56:05 -06:00
Nicole Thomas
1834bdefe3 Merge pull request #32531 from ticosax/support-no-volumes 
[dockerng] Fix support of dockerng.volume_present when no volume is on present.
 2016-04-13 08:42:12 -06:00
Nicolas Delaby
5d73d54ed2 Enhance dockerng.wait() to control success on exit_code and on already stopped containers (#32475) 2016-04-13 08:16:26 -06:00
Bo Maryniuk
214f01e963 Bugfix: salt-key crashes if tries to generate keys to the directory w/o write access (#32436) 
* Raise an exception if keys are tried to be written to the directory that has no write access permissions

* Show an reasonable error message instead of a traceback crash.

* Fix the unit tests
 2016-04-13 08:15:37 -06:00
Erik Johnson
288839f4b6 Turn on exc_info when logging failed minion startup (#32515) 2016-04-13 08:13:53 -06:00
Erik Johnson
08a80207e6 Add ignore_epoch option to pkg.installed/removed/purged states (#32520) 
This allows for the epoch to be disregarded when a version is specified.
 2016-04-13 08:11:33 -06:00
Nicolas Delaby
958b2ec749 Fix support of dockerng.volume_present when no volume is on present. 
fixes #32493
 2016-04-13 15:47:13 +02:00
Bo Maryniuk
492ebfc184 Isbm zypper list products sles11 crash (#32505) 
* Check for EOL aggregate and fix time_t attribute

* Update SLE11 SP3 data

* Update SLE12 SP1 data

* Adjust test values according to the testing data
 2016-04-12 08:14:19 -06:00
Erik Johnson
ae89882fed Clear VCS fsbackend and git_pillar locks on master start (#32480) 
* Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks

* Clear VCS fsbackend and git_pillar locks on master start

* Fix loop in maint.flo
 2016-04-11 16:56:08 -06:00
Shane Lee
a6482a3171 Use win32api to get Total System Memory (#32491) 
Fixes: #32327
 2016-04-11 16:32:52 -06:00
Nicole Thomas
e335e313fe Merge pull request #32487 from terminalmage/epoch-documentation 
Add explanation of nonzero epoch requirement to pkg.installed state documentation
 2016-04-11 14:48:57 -06:00
Nicole Thomas
e8de50ff37 Merge pull request #32482 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-11 14:12:26 -06:00
Erik Johnson
e04cf879b6 Document new behavior of pkg.installed for yum/dnf packages with non-zero epoch 2016-04-11 14:42:23 -05:00
Erik Johnson
61e9761224 Add explanation of nonzero epoch requirement to pkg.installed state documentation 
Resolves #31927.
 2016-04-11 14:35:27 -05:00
rallytime
1b04f0ddec Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/ref/modules/all/index.rst
  - doc/ref/modules/index.rst
  - salt/modules/systemd.py
  - salt/modules/zypper.py
 2016-04-11 11:33:08 -06:00
Nicole Thomas
29333e533e Add documentation for some master/minion configs (#32454) 
Refs #32400

Adds docs for:

- cli_summary
- event_return_queue
- event_return_whitelist
- event_return_blacklist
- file_recv_max_size
- fileserver_followsymlinks
- fileserver_ignoresymlinks
- fileserver_limit_traversal
 2016-04-11 10:49:52 -06:00
Dmitry Kuzmenko
f5bd6bdcc3 Backport 31164 and 31364 (#32474) 
* Don't send REQ while another one is waiting for response.

The message has to be removed from the queue the only *after* it's
already processed to don't confuse send() functionality that expects
empty queue means: there's no active sendings.

* Fixed zeromq ReqMessageClient destroy
 2016-04-11 08:02:36 -06:00
Nicole Thomas
100c6e1b25 Merge pull request #32458 from terminalmage/clarify-providers-docs 
Improve and clarify docs on provider overrides.
 2016-04-09 08:25:42 -06:00
Erik Johnson
500d3ebbaa Add link to provider override docs to all group providers 2016-04-08 23:36:02 -05:00
Erik Johnson
83ca01f620 dd link to provider override docs to all shadow providers 2016-04-08 23:34:31 -05:00
Erik Johnson
c5fe38789d Add link to provider override docs to all user providers 2016-04-08 23:32:41 -05:00
Erik Johnson
5c1c1dda59 Add link to provider override docs to all service providers 2016-04-08 23:04:14 -05:00
Erik Johnson
736f2befc9 Add link to provider override docs to all package providers 2016-04-08 22:58:08 -05:00
Erik Johnson
f9306347cc Clarify the scope of the provider param in states. 2016-04-08 22:05:36 -05:00
Erik Johnson
af24c82ab0 Add documentation on virtual module provider overrides to the module docs 2016-04-08 22:01:14 -05:00
Erik Johnson
0bc6c97a63 Improve docstrings 2016-04-08 22:00:56 -05:00
Erik Johnson
1948920674 Add external ref to windows package manager docs 2016-04-08 22:00:06 -05:00
Erik Johnson
e7fa21438c Add new doc pages to toctree 2016-04-08 21:59:21 -05:00
Erik Johnson
f0de1236ec Move the tables of virtual modules to individual documentation pages 2016-04-08 21:58:11 -05:00
Nicole Thomas
7bf44aea72 Merge pull request #32450 from cachedout/issue_31738 
Pass parser options into batch mode
 2016-04-08 17:03:49 -06:00
Nicole Thomas
b29983529f Issue #28706: Fix state user.present behavior. (#32448) 
- As mentionned in issue #28706, state user.present no longer remove
      user from groups if the keyword 'groups' with empty value '[]' is not
      explicitly set, salt will assume current groups are still wanted.
 2016-04-08 16:32:26 -06:00
Nicole Thomas
cef33d5fad Argument name in docs should match actual arg name (#32445) 
Fixes #31851
 2016-04-08 16:00:27 -06:00
Mike Place
74d0fa06b4 Pass parser options into batch mode 
Resolves #31738
 2016-04-08 15:56:03 -06:00
Nicole Thomas
a36f9499fc Merge pull request #32432 from ticosax/fix-domainname-introspection 
[dockerng] Fix Domainname introspection
 2016-04-08 10:12:19 -06:00
Nicole Thomas
def911974c Merge pull request #32427 from rallytime/merge-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2016-04-08 09:39:13 -06:00
Nicolas Delaby
505b5b0168 Fix Domainname introspection 
Default value needs to be extracted from the container itself,
because dockerd set Domainname value when network_mode=host.
 2016-04-08 11:02:05 +02:00
rallytime
9531ea6ef5 Merge branch '2015.5' into '2015.8' 
Conflicts:
  - doc/topics/highavailability/index.rst
  - salt/loader.py
  - salt/modules/service.py
  - salt/states/cmd.py
  - tests/unit/states/cmd_test.py
 2016-04-07 16:10:32 -06:00
Nicole Thomas
5bc8c326ce Merge pull request #32423 from jtand/glusterfs_test_fix 
Update glusterfs_test to be inline with #32312
 2016-04-07 15:53:03 -06:00
Nicole Thomas
c07e02bacb Merge pull request #32425 from cachedout/issue_31632 
Fix salt-cloud paralell provisioning
 2016-04-07 15:52:06 -06:00
Nicole Thomas
0809126d8e Merge #32293 with test fixes (#32418) 
* Fix issue #11497

* Remove check for working directory presence in tests
 2016-04-07 14:55:25 -06:00
Erik Johnson
bbd8260a42 Ignore Raspbian in service.py __virtual__ (#32421) 
* Ignore Raspbian in service.py __virtual__

This prevents more than one execution module from trying to load as the
service virtual module.

Refs: #32413

* pack __salt__ before loading provider overrides

We can (and should) pack here since we're just packing a reference to the
object. __salt__ needs to be available when we're loading our provider
overrides

* Fix broken __salt__ dict in provider override

Using ret.items() here sets ``__salt__`` to its items (tuple containing
function name and reference), breaking usage of ``__salt__`` inside
overridden functions.
 2016-04-07 14:54:38 -06:00
Mike Place
127c0829ee Fix salt-cloud paralell provisioning 
Closes #31632
 2016-04-07 14:50:35 -06:00
Justin Anderson
6f98bd50eb Update glusterfs_test to be inline with #32312 2016-04-07 14:38:21 -06:00
Andres Montalban
690addf0b4 FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info. 2016-04-07 09:11:54 -06:00
Andres Montalban
51fb2ac4c7 FreeBSD supports packages in format java/openjdk7 so the prior commit broke that functionality. Check freebsd/pkg#1409 for more info. 2016-04-07 09:11:42 -06:00
Erik Johnson
709410ada3 Improve git_pillar documentation/logging 
* Add note about different behavior of top file in git_pillar

* Make log entry for a missing pillar SLS file more accurate for git_pillar
 2016-04-07 09:10:53 -06:00
Nicole Thomas
c53efc3349 Update master config docs 2016-04-07 09:10:19 -06:00