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
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
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
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
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
Nicole Thomas
a36866d7db
Merge pull request #32399 from amontalban/2015.5
...
Backport to fix #28262 for 2015.5 as requested in PR #32376
2016-04-06 16:48:23 -06:00
Andres Montalban
e1ffbd615a
Fixes saltstack/salt#28262 for 2015.5 branch
2016-04-06 19:03:28 -03:00
Mike Place
3f03c5fcf9
Merge pull request #32374 from cachedout/issue_32066
...
Update proxmox documentation
2016-04-05 16:25:16 -06:00
Mike Place
62389d1d1a
Update proxmox documentation
2016-04-05 16:24:26 -06:00
Mike Place
8578089beb
Merge pull request #32339 from Ch3LL/fix_doc_multi-master
...
remove reference to master_alive_check in 2015.5
2016-04-04 14:39:24 -06:00
Ch3LL
2774da288d
remove reference to master_alive_check
2016-04-04 13:49:33 -06:00
Erik Johnson
fbdc47cc55
Merge pull request #32284 from rallytime/config-audit
...
Audit config.py default types and values
2016-04-01 21:00:38 -05:00
rallytime
0491513204
Don't be so explicit. Just use string_types.
2016-04-01 17:12:39 -06:00
Nicole Thomas
0a6d44e57b
Merge pull request #32302 from terminalmage/fix-missing-release
...
Properly support packages with blank "Release" param in pkg.latest_version
2016-04-01 16:13:27 -06:00
rallytime
083c477fd3
Use six.string_types in config default tuples
2016-04-01 16:09:57 -06:00
Erik Johnson
413c371ccd
Properly support packages with blank "Release" param in pkg.latest_version
2016-04-01 15:49:20 -05:00
rallytime
7e642b8381
Audit config.py default types and values - first sweep
...
- Updated standard types in VALID_OPTS dict where necessary
- Updated default values to match VALID_OPTS in DEFAULT_*_OPTS dicts
- Updated master/minion configuration reference docs to match changes
- Removed enumerate_proxy_minions value as it's not referenced anywhere in code
2016-03-31 13:50:51 -06:00
Mike Place
5d08db7c92
Merge pull request #32162 from terminalmage/issue31963
...
Properly handle yum/zypper repositories in pkgrepo.managed
2016-03-30 11:51:05 -06:00
Erik Johnson
5c1bdb812c
Fix pkgrepo integration test
...
Also re-enabled test on ubuntu 15.10.
2016-03-30 11:34:55 -05:00
Mike Place
4fcdaab428
Merge pull request #32223 from twangboy/fix_31976
...
Create minion.d directory on install for Windows
2016-03-30 08:43:27 -06:00
Erik Johnson
e7fb3095ce
Properly handle yum/zypper repositories in pkgrepo.managed
...
When comparing the current state of the repo to the desired state, there
is a key called ``disabled`` which we support, which is not in the
``pkg.get_repo`` return data. This caused yum repos to always identify
as needing to be modified, and calling ``pkg.mod_repo`` every time the
state was run.
This commit fixes this behavior and also improves the documentation for
this state.
2016-03-29 15:29:32 -05:00
Erik Johnson
add2111fec
Use six.iteritems instead of dict.items
...
Also more reliably handle commands run in pkg.mod_repo
2016-03-29 15:29:32 -05:00
Erik Johnson
6c21881c38
Docstring tweaks
2016-03-29 15:29:32 -05:00
Erik Johnson
ecbb78b649
Remove useless function
...
This function is not called if not present, so it serves no purpose
2016-03-29 15:29:32 -05:00
Erik Johnson
06f3309552
Normalize variable naming to match other functions
2016-03-29 15:29:32 -05:00
Erik Johnson
690537ca8b
Look for apt-add-repository in PATH instead of assuming it's there
...
Depending on the ubuntu version, apt-add-repository is provided by
different packages. Some versions put it in python-software-properties,
and some put it in software-properties-common. It is incorrect to assume
it's there because the ``softwareproperties`` python module is
available, since it is provided by python-software-properties (and
apt-add-repository may or not be also provided by that package).
2016-03-29 15:29:32 -05:00
Erik Johnson
709d80bb1b
aptpkg: Accept **kwargs instead of a dict for pkg.expand_repo_def
2016-03-29 15:29:31 -05:00
twangboy
b7fcae97ce
Create minion.d directory, fixes #31976
2016-03-29 14:17:24 -06:00
Mike Place
3309ff6a29
Merge pull request #32218 from cachedout/issue_31501
...
Only display error when tty is True in salt-ssh
2016-03-29 13:13:44 -06:00
Mike Place
6795d6aef0
Only display error when tty is True in salt-ssh
2016-03-29 12:08:24 -06:00
Mike Place
6e0cb22c96
Merge pull request #32196 from jtand/cherrypy_pam_test_lint_fix
...
Fixed pylint error in app_pam_test.py
2016-03-28 17:59:42 -06:00
Justin Anderson
bd3942e0fd
Fixed pylint error in app_pam_test.py
2016-03-28 17:04:47 -06:00
Mike Place
6b8b8b51c0
Merge pull request #32154 from Ch3LL/ch3ll_pam_2015.5
...
Add integration tests for salt-api using pam eauth
2016-03-28 10:06:36 -06:00
Nicole Thomas
230443be6c
Merge pull request #32170 from gtmanfred/lxc_cloud_name
...
add name for lxc for use with cloud cache
2016-03-28 08:34:16 -06:00
Daniel Wallace
eb7d82e7be
add name for lxc for use with cloud cache
...
needed for use in `cache_node` in salt/utils/cloud.py
2016-03-27 21:36:34 -05:00
Nicole Thomas
32b0421a34
Merge pull request #32164 from terminalmage/issue31731-2015.5
...
Make __virtual__ for rhservice.py more robust (2015.5 branch)
2016-03-27 12:21:52 -06:00
