Commit Graph

1759 Commits

Author SHA1 Message Date
rallytime
f577681f0b Update docs to match log_level warning default
Fixes #34162
2016-06-21 09:31:59 -06:00
Jacob Hammons
887a415138 Adds new Understanding Jinja topic, and fixes several Jinja doc issues.
Removes the "Full list of builtin ..." from each module reference list, leaving just the module type for scanability.

Refs #12470
Refs #10206
Refs #10480
Refs #23522
Refs #33023
2016-06-13 18:30:42 -06:00
Mike Place
500d4ccec2 Reminder not to return non-serializable data from states
Refs #31837
2016-06-03 12:13:47 -06:00
rallytime
a5e0141eda Merge branch '2015.8' into '2106.3'
Conflicts:
  - salt/beacons/__init__.py
  - salt/modules/saltutil.py
  - salt/modules/zypper.py
  - salt/states/grains.py
  - salt/states/pkgrepo.py
  - salt/states/service.py
2016-05-25 13:44:21 -06:00
rallytime
03b0c97520 Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/ref/configuration/minion.rst
2016-05-25 12:26:00 -06:00
Mike Place
f72ec1479b Merge pull request #33482 from rallytime/pillar-opts-docs
Add pillar_opts docs to master.rst
2016-05-25 09:39:25 -07:00
rallytime
b0a9f4181f Add docs for the syndic_finger config
Fixes #18752
2016-05-24 16:10:43 -06:00
rallytime
087564528d Add pillar_opts docs to master.rst 2016-05-24 13:26:24 -06:00
rallytime
7fd3e8f361 Fix docs about etcd config options and add pillar_opts doc
Fixes #33423
2016-05-24 13:19:20 -06:00
rallytime
1febb0e13a Merge branch '2015.8' into '2016.3'
No conflicts.
2016-05-20 10:35:25 -06:00
rallytime
5aec32b20f Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-19 18:18:10 -06:00
Mike Place
755acfb97e Improve doc clarity for disable_modules documentation (#33379)
* Improve doc clarity for disable_modules documentation

* Additional clarification on blacklisted name
2016-05-19 16:31:41 -06:00
rallytime
35ad788470 Merge branch '2015.8' into '2016.3'
Conflicts:
  - conf/minion
  - doc/ref/configuration/minion.rst
  - salt/modules/boto_elb.py
  - salt/modules/sudo.py
  - salt/states/boto_elb.py
  - salt/transport/zeromq.py
2016-05-19 16:22:36 -06:00
Nicole Thomas
4fdb097c01 Update job_cache and keep_jobs docs to be more specific to their behavior (#33328)
* Update job_cache and keep_jobs docs to be more specific to their behavior

Also fixed a bug discovered when investigating job_cache/keep_jobs functionality
where the jid directory and files were removed by the cache cleaner, but not the
original jid clash detection directory created in /var/cache/salt/master/jobs/.

Fixes #29286

* Add testcase for the changes in the local_cache.clean_old_jobs func

* Mark tests as destructive

* Put destructive test decorator in correct location
2016-05-19 09:32:32 -07:00
C. R. Oldham
11a25255ec Bp 28467 calm mine (#33327)
* make minion mine update behavior more configurable

* Add docs for mine_functions config var

* Remove config dup from mine config options

Refs #28467

* 2015.8 does not have _DFLT_MULTIPROCESSING_MODE

* This won't be in until 2015.8.10.
2016-05-18 09:37:41 -07:00
C. R. Oldham
d375c1fe37 Add docs for mine_functions config var (#33326)
* Add docs for mine_functions config var

* Note that mine_enabled essentially just doesn't add the mine
update function to the scheduler.
2016-05-18 09:32:06 -07:00
Justin Findlay
089c1a2513 remove redundant, incorrect sudo_runas config documentation (#33318)
* remove sudo_runas documentation

`sudo_runas` was renamed to `sudo_user` and the documentation was not
updated accordingly.

* conf/minion: update sudo_user description

The description from sudo_runas was better.
2016-05-18 09:15:42 -07:00
rallytime
779f31cc20 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-05-17 13:41:19 -06:00
rallytime
1c43a62f85 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-17 11:23:41 -06:00
Nicole Thomas
9b42a05519 Added some more docs for master and minion config settings (#33292)
* Added some more docs for master and minion config settings

Configs addressed:
  - auth_safemode
  - auth_timeout
  - conf_file
  - gather_job_timeout
  - jinja_lstrip_blocks
  - jinja_trim_blocks
  - max_event_size

* Change "sub minion" to "sub-minion"
2016-05-17 09:58:20 -07:00
rallytime
5004d2fa61 Merge branch '2015.5' into '2015.8'
No conflicts.
2016-05-17 10:36:07 -06:00
jacobhammons
7e95127467 man pages updated (#33307)
sphinx build fixes
doc additions for new modules including thorium
2016-05-17 10:24:44 -06:00
David Boucha
757ef20a31 fix "loose" typo (#33290) 2016-05-16 17:13:40 -06:00
Nicole Thomas
b7d98da64d Add auth_tries config option to minion.rst docs (#33287) 2016-05-16 14:17:19 -07:00
rallytime
fdc877b4dc Document new master and minion config opts for 2016.3.0
Docs were added for:
  - master_tries
  - mine_enabled
  - mine_return_job
  - syndic_failover
  - auth_tries: this is an old setting, but docs were not found
in the minion.rst docs. This change should be added to older branches.
2016-05-16 14:51:13 -06:00
Nicole Thomas
061851bcbf Document minion_id_caching config value (#33282)
Fixes #33276
2016-05-16 13:12:38 -07:00
Nicole Thomas
59a84a4674 Add docs for new master failback options (#33280)
Fixes #32492
2016-05-16 12:11:38 -07:00
rallytime
32779b8d71 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/x509.py
2016-05-16 10:47:12 -06:00
Nicole Thomas
4f3596a69f Add comment for test=true w/o changes ret and add changes dict example (#33254)
Fixes #30258

Add simple changes dictionary example
2016-05-15 13:13:43 -07:00
Nicole Thomas
6fb25a8440 Make note of files that begin with '_' in master.d or minion.d dirs (#33224)
* Make note of files that begin with '_' in master.d or minion.d dirs

Fixes #21903

* Be more specific about where '_' files come from.
2016-05-13 09:14:57 -07:00
Thomas S Hatch
813f27e807 Add clarity on docs for require sls 2016-05-04 10:18:19 -06:00
rallytime
c12b9a5094 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-05-02 10:50:27 -06:00
brad-alexander
e7f7aa67d9 Add documentation for transport_opts (#32940) 2016-04-29 09:59:05 -06:00
Justin Findlay
b2d7c81f66 doc.ref.states.ordering: clarify requisite change (#32934) 2016-04-28 15:41:01 -06:00
rallytime
9033060106 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/states/archive.py
2016-04-28 14:22:58 -06:00
Nicole Thomas
f581a8218d Remove FileClient class references from docs - it doesn't exist. (#32925)
* Remove FileClient class references from docs - it doesn't exist.

Replace FileClient class references with mentions of the fileclient.py
module and replace code examples with salt.fileclient.get_file_client
examples.

Fixes #32646

* Don't reference minion import when not used
2016-04-28 14:14:40 -06:00
rallytime
80fcdfb9d8 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/targeting/grains.rst
  - salt/cli/daemons.py
  - salt/exceptions.py
  - salt/minion.py
  - salt/modules/schedule.py
  - salt/scripts.py
  - salt/states/archive.py
2016-04-26 12:07:42 -06:00
rallytime
9064d3bbfb Merge branch '2015.5' into '2015.8'
Conflicts:
  - salt/cloud/clouds/vmware.py
  - salt/modules/file.py
  - salt/states/archive.py
2016-04-25 15:45:17 -06:00
Nicole Thomas
f9ffcb697a [2016.3] Merge forward from 2015.8 to 2016.3 (#32784)
* json encode arguments passed to an execution module function call

this fixes problems where you could pass a string to a module function,
which thanks to the yaml decoder which is used when parsing command line
arguments could change its type entirely. for example:

__salt__['test.echo')('{foo: bar}')

the test.echo function just returns the argument it's given. however,
because it's being called through a salt-call process like this:

salt-call --local test.echo {foo: bar}

salt thinks it's yaml and therefore yaml decodes it. the return value
from the test.echo call above is therefore a dict, not a string.

* Prevent crash if pygit2 package is requesting re-compilation of the e… (#32652)

* Prevent crash if pygit2 package is requesting re-compilation of the entire library on production systems (no *devel packages)

* Fix PEP8: move imports to the top of the file

* Move logger up

* Add log error message in case if exception is not an ImportError

* align OS grains from older SLES with current one (#32649)

* Fixing critical bug to remove only the specified Host instead of the entire Host cluster (#32640)

* yumpkg: Ignore epoch in version comparison for explict versions without an epoch (#32563)

* yumpkg: Ignore epoch in version comparison for explict versions without an epoch

Also properly handle comparisions for packages with multiple versions.

Resolves #32229

* Don't attempt downgrade for kernel and its subpackages

Multiple versions are supported since their paths do not conflict.

* Lower log level for pillar cache (#32655)

This shouldn't show up on salt-call runs

* Don't access deprecated Exception.message attribute. (#32556)

* Don't access deprecated Exception.message attribute.

To avoid a deprecation warning message in logs.
There is a new function salt.exceptions.get_error_message(e) instead.

* Fixed module docs test.

* Fix for issue 32523 (#32672)

* Fix routes for redhat < 6

* Handle a couple of arguments better (Azure) (#32683)

* backporting a fix from develop where the use of splay would result in seconds=0 in the schedule.list when there was no seconds specified in the origina schedule

* Handle when beacon not configured and we try to enable/disable them (#32692)

* Handle the situation when the beacon is not configured and we try to disable it

* a couple more missing returns in the enable & disable

* Check dependencies type before appling str operations (#32693)

* Update external auth documentation to list supported matcher. (#32733)

Thanks to #31598, all matchers are supported for eauth configuration.
But we still have no way to use compound matchers in eauth configuration.
Update the documentation to explicitly express this limitation.

* modules.win_dacl: consistent case of dacl constants (#32720)

* Document pillar cache options (#32643)

* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job

* Properly handle minion failback failure. (#32749)

* Properly handle minion failback failure.

Initiate minion restart if all masters down on __master_disconnect like
minion does on the initial master connect on start.

* Fixed unit test

* Improve documentation on pygit2 versions (#32779)

This adds an explanation of the python-cffi dep added in pygit2 0.21.0,
and recommends 0.20.3 for LTS distros. It also links to the salt-pack
issue which tracks the progress of adding pygit2 to our Debian and
Ubuntu repositories.

* Pylint fix
2016-04-25 15:26:09 -06:00
Justin Findlay
9b5c14c37c salt-cloud -u downloads stable version from bootstrap.saltstack.com by default (#32837)
* salt-cloud -u downloads stable version

* utils.cloud.update_bootstrap: minor edits of docstring
2016-04-25 13:53:54 -06:00
Denys Havrysh
3751a270d7 Document pillar cache options (#32643)
* Add note about Pillar data cache requirement for Pillar targeting method

* Add `saltutil.refresh_pillar` function to the scheduled Minion jobs

* Minor fixes in docs

* Add note about relations between `pillar_cache` option and Pillar Targeting
to Master config comments with small reformatting

* Document Pillar Cache Options for Salt Master

* Document Minions Targeting with Mine

* Remove `saltutil.refresh_pillar` scheduled persistent job
2016-04-22 08:54:30 -06:00
Erik Johnson
aa9c458346 Add json5 renderer (#32635)
* Add JSON5 renderer

* Add documentation RST files for json5 renderer
2016-04-16 12:37:42 -06:00
rallytime
bbec183474 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/minion.py
  - salt/states/user.py
2016-04-15 13:58:50 -06:00
Daniel Wallace
0b370d67b4 alphabetize directories for dynamic modules (#32599)
Also add engines and proxy minions to the list.
2016-04-15 08:58:19 -06:00
Erik Johnson
ab9da90ced Revert PR #32480 and apply #32314 with fixes / documentation (#32558)
* Revert "Fix loop in maint.flo"

This reverts commit 5196cd6a6e5db3c7b1a47b1740881bbd3e87ea3d.

* Revert "Clear VCS fsbackend and git_pillar locks on master start"

This reverts commit 7e3caa9bae1ac4de62db9924374e35a8b826937e.

* Revert "Add functions to remove VCS fsbackend update locks and git_pillar update/checkout locks"

This reverts commit 4c2db32419022501eae2a695ec488693e043d189.

* prevent eternal gitfs lock due to process crash

* Use salt.utils.fopen() instead of open()

* Make pid locking work for more than just gitfs

Also, make logging more descriptive, to aid in troubleshooting.

* Add git_pillar_global_lock config option default value

* Document proper usage of {gitfs,git_pillar}_global_lock
2016-04-14 10:36:59 -06:00
rallytime
b77993d9a1 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
  - doc/topics/targeting/grains.rst
  - salt/crypt.py
  - salt/scripts.py
  - salt/states/dockerng.py
  - salt/states/pkg.py
2016-04-13 09:42:54 -06:00
rallytime
fbaeb165c9 Merge branch '2015.5' into merge-2015.8
No conflicts.
2016-04-13 09:07:39 -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
rallytime
4f03f2311f Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/cli/salt.py
  - salt/modules/win_pkg.py
  - salt/transport/tcp.py
2016-04-11 14:33:21 -06:00