Commit Graph

447 Commits

Author SHA1 Message Date
Ivan Babrou
6ffeda3ee5 Clarify ipv6 option for minion and inteface for master, closes #39118 (#39131)
* Clarify ipv6 option for minion and inteface for master, closes #39118

* Add ipv6 reference
2017-02-02 08:35:00 -07:00
Erik Johnson
6b014e53fc Rename on_demand_pillar to on_demand_ext_pillar 2017-01-25 15:08:57 -06:00
Erik Johnson
d216f90c63 Document new on_demand_pillar option and add to config template 2017-01-25 14:43:14 -06:00
Denys Havrysh
51d4707071 DOCS: add links to File State Backups page where necessary (#38735) 2017-01-14 11:49:21 -07:00
Erik Johnson
27253522c8 Improve pillar documentation (#38407)
* rename anchor

* Move pillar cache config option to different section, add an anchor

* Add links to master and minion config items

* Add documentation for pillar.item's "delimiter" argument

* Improve pillar documentation

This improves RST formatting, adding hyperlinks as well as adding
information on the difference between in-minion pillar data and
pillar data that is compiled on-demand.

* Add section on how pillar environments are handled
2016-12-22 10:32:37 -07:00
Mike Place
c83db5a785 Merge pull request #38320 from rallytime/cleanup-doc-refs
Cleanup doc internal markup references
2016-12-18 05:31:27 -07:00
rallytime
4aafa41d22 Remove ":doc:" references from a bunch of doc/* files 2016-12-15 16:09:27 -07:00
rallytime
4a62d01577 Add docs for syndic_wait setting
Fixes #38174
2016-12-15 10:40:01 -07:00
Nicole Thomas
6942d5d95b Merge pull request #37995 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-11-30 13:12:55 -07:00
rallytime
b44e17921c Merge branch '2015.8' into '2016.3'
No conflicts.
2016-11-30 09:21:45 -07:00
Denys Havrysh
7d9bc9abce syndic_master: correct default value, documentation and example config 2016-11-30 17:18:44 +02:00
Erik Johnson
61ed9a8657 Add clarifying language to ext_pillar_first docs
Also remove a sentence which may lead people to believe that they can
make git_pillar and pillar_roots share top/sls files and be compiled
together.
2016-11-29 15:49:05 -06:00
Mike Place
ea46639ce7 Merge pull request #37272 from vutny/fix-getting-default-logging-opts
Get default logging level and log file from default opts dict
2016-11-28 16:04:20 -07:00
Denys Havrysh
83d6a44254 Add ssh_log_file option to master config and documentation 2016-11-20 16:13:55 +02:00
Denys Havrysh
c8a0915460 Fix configuration example and documentation for syndic_log_file option 2016-11-19 13:11:36 +02:00
Jonathan Ballet
89b9417605 Documentation rendering fixes (#37543)
* doc: fix documentation rendering of salt.runners.survey

* doc: fix Sphinx documentation warnings
2016-11-08 09:42:12 -07:00
Justin Findlay
478def4923 doc.ref.configuration.minion: add proxy vars 2016-10-18 10:50:37 -06:00
rallytime
5362e5183e Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/cli/index.rst
2016-10-12 12:36:00 -06:00
Erik Johnson
a56bf8bd2d Update references to future default value change that was reverted (#36924) 2016-10-11 16:33:41 -06:00
Yoram Hekma
3bb2cb6379 Update doc to reflect the version where 'none' was added as a pillar_source_merging_strategy 2016-09-30 15:59:21 -06:00
Justin Findlay
4dd4fc94dc log levels doc: try long form table
sphinx didn't render the shorthand table
2016-09-29 10:11:06 -06:00
rallytime
da574e5b03 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/client/ssh/__init__.py
  - salt/config/__init__.py
  - salt/runners/thin.py
2016-09-28 09:01:24 -06:00
Bo Maryniuk
a441b35588 Add documentation about Salt Thin configuration 2016-09-27 11:12:07 +02:00
Nicole Thomas
5548ed771d Back-port #36435 to 2016.3 (#36532)
* Added "none" option for pillar_source_merging_strategy

* added none to merging strategy in dictupdate so we no longer log warnings when it is selected

* Updated documentation

* fix for when pillar_source_merging_strategy is not set

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed

* Fix looking up pillar data when merging is set to "none" and no saltenv was passed retry

* Let's not break when no merging strategy is passed

* Capitalisation

* Update on doc
2016-09-23 13:36:23 -06:00
Erik Johnson
cc9d41fb0e Change items in minionfs blacklist/whitelist example
These were copypasta'ed from gitfs' blacklist/whitelist example, but
they aren't as apropos here because the blacklist/whitelist for minionfs
is meant to refer to minion IDs, not branches/tags like in gitfs.
2016-09-22 18:22:03 -05:00
Nicole Thomas
96792663da Add engines to list of extension module options in master config docs (#35864)
Fixes #35837
2016-08-29 12:22:30 -06:00
rallytime
5f93d682aa Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/client/ssh/__init__.py
2016-08-29 10:56:11 -06:00
Erik Johnson
c534d88280 More clarification/correction in minion docs 2016-08-27 15:18:06 -05:00
rallytime
e8e73b55ac Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/topics/jobs/schedule.rst
  - salt/states/user.py
2016-08-26 13:21:12 -06:00
Erik Johnson
2fc61763d8 Correct the top_file_merging_strategy documentation (#35774)
Top file merging does not work as described in the docs, this is being
corrected for the Carbon release. This commit fixes the docs so that
they A) are accurate for these older release branches, and B) refer to
the Carbon release as a point when top file merging was corrected.

These references to the Carbon release will need to be updated again
once we settle on a version number for Carbon.
2016-08-26 10:25:56 -06:00
rallytime
1d819d7cc2 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-08-22 09:29:13 -06:00
Brian Glogower
2801f0fdcc Remove duplicate auth_tries in minion docs 2016-08-19 17:46:26 -07:00
Nicole Thomas
f7f8221169 Everything in the sample master config file should be commented out (#35611) 2016-08-19 16:05:40 -06:00
Justin Findlay
66332510c6 doc.ref.configuration.logging: document log levels 2016-08-10 14:10:43 -06:00
Justin Findlay
93616eff3e doc.ref.configuration.logging: fix formatting 2016-08-10 10:47:07 -06:00
Justin Findlay
472a2d31de doc.ref.configuration.logging: cleanup formatting 2016-08-10 10:46:39 -06:00
C. R. Oldham
84cc7d67c0 Add documentation for append_minionid_config_dirs. 2016-08-03 12:36:37 -06:00
rallytime
7d106c78f0 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-07-18 09:45:00 -06:00
rallytime
9c803d05a5 Add output_file option to master config docs
Fixes #34703
2016-07-16 12:45:55 -06:00
rallytime
f734afd0b0 Merge branch '2015.8' into '2016.3'
Conflicts:
  - salt/modules/aptpkg.py
  - tests/integration/__init__.py
2016-07-12 14:29:35 -06:00
Erik Johnson
ae38c874da Add a bunch of documentation on getting files from other environments (#34560)
* Remove :members: from fileserver docs pages

These functions can never be invoked directly from the CLI, so it is
pointless to include them in the documentation.

* Rename section

* Add docs page clarifying how to get files from different environments

* Add reminder that file_roots can be specified for masterless salt

* Link to the new environments page from the states tutorial

* Add information on pulling reactor configs from non-base environments

* Add examples of querystring syntax to cp module
2016-07-08 17:15:27 -04:00
rallytime
27988dde48 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/configuration/minion.rst
2016-07-07 12:31:12 -06:00
Erik Johnson
8722257b82 Improve top file merging documentation (#34505)
* Add top file config params to minion config file documentation

* Improve documentation on top file merging behavior

* Add recommendation on changing top_file_merging_strategy

* Improve the log message warning of multiple top files
2016-07-07 12:04:27 -04:00
rallytime
f9ab8ba46d Merge branch '2015.8' into '2016.3'
No conflicts.
2016-06-28 14:26:24 -06:00
jacobhammons
0c60feac02 Doc clarifications to file modules, addition of new profile log level to docs, fixed example in dnsmasq (#34323)
Refs #34249
Refs #34261
Refs #33694
Refs #34247
2016-06-28 12:03:59 -04:00
rallytime
f577681f0b Update docs to match log_level warning default
Fixes #34162
2016-06-21 09:31:59 -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