valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
86,610 Commits 24 Branches 182 Tags 341 MiB
d29218e043
Commit Graph

667 Commits

Author SHA1 Message Date
rallytime
be8f650901 Punctuation. 2015-11-02 19:30:58 -06:00
rallytime
fd846822c1 Add state_auto_order defaults to True note to ordering docs 
Fixes #28243
 2015-11-02 19:29:32 -06:00
Colton Myers
b3f3275e0a Merge pull request #28163 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-10-21 16:46:40 -06:00
Colton Myers
a471832fa7 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/ec2.py
    salt/config/__init__.py
    salt/modules/git.py
    salt/modules/hosts.py
    salt/modules/htpasswd.py
    salt/states/boto_secgroup.py
    salt/states/htpasswd.py
    tests/unit/modules/schedule_test.py
 2015-10-20 18:13:11 -06:00
Thayne Harbaugh
7f8d5a56d1 Improve documentation of check_cmd. 
* Make the distinction between requisite `check_cmd` and `file.managed`
  `check_cmd`.

* Be more clear about `file.managed` `check_cmd`, the temporary file,
  and when the new contents are written or discarded.

* In requisite `check_cmd` use a concise `!` rather than the awkward
  `&& exit 1 || exit 0`.

* A few minor, stylistic changes.
 2015-10-20 13:44:06 -06:00
C. R. Oldham
3712066fc9 More docs. 2015-10-19 13:19:20 -06:00
C. R. Oldham
4ce2f8bb11 Documentation. 2015-10-16 16:52:14 -06:00
Richard Hansen
9aa19575fa new ldap state module 2015-10-09 17:47:56 -04:00
Colton Myers
69d960f8e6 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/topics/ssh/index.rst
    salt/modules/boto_secgroup.py
    salt/modules/dockerng.py
    salt/states/archive.py
    salt/states/boto_elb.py
    salt/states/boto_secgroup.py
    tests/unit/modules/schedule_test.py
 2015-10-07 13:11:48 -06:00
Daniel Hahler
98a8c0f055 doc: minor fixes to doc and comments 2015-10-02 01:18:32 +02:00
Jonathan Ballet
97e69ebb97 doc: fix state's top documentation typo 2015-09-25 12:16:48 -06:00
jacobhammons
24e665335d Merge pull request #27399 from multani/fix/docs 
Various documentation fixes
 2015-09-25 09:42:52 -06:00
Jonathan Ballet
c4e7392a2b doc: fix state's top documentation typo 2015-09-25 10:36:27 +02:00
Colton Myers
ec6cd80496 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/ref/auth/all/index.rst
    doc/ref/auth/all/salt.auth.rest.rst
    doc/ref/beacons/all/index.rst
    doc/ref/beacons/all/salt.beacons.ps.rst
    doc/ref/pillar/all/index.rst
    doc/ref/pillar/all/salt.pillar.consul_pillar.rst
    doc/ref/pillar/all/salt.pillar.neutron.rst
    doc/ref/pillar/all/salt.pillar.sql_base.rst
    doc/ref/pillar/all/salt.pillar.sqlite3.rst
    doc/ref/sdb/all/salt.sdb.rest.rst
    salt/modules/rh_ip.py
    salt/utils/http.py
 2015-09-22 15:31:46 -06:00
Arnold Bechtoldt
3a7d31a91c add missing module references 2015-09-20 13:22:32 +02:00
Colton Myers
26b6c92975 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    salt/config/__init__.py
    salt/modules/rh_ip.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/user.py
    salt/templates/rh_ip/rh7_eth.jinja
 2015-09-17 11:10:37 -06:00
Jacob Hammons
f7a9e25d52 Fixed sphinx / latex build warnings and errors 
Added missing modules to contents
 2015-09-17 09:23:24 -06:00
Justin Findlay
0d62d3470c Merge pull request #27111 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-15 01:29:30 -06:00
Jacob Hammons
d939a38c8c release notes updates 2015-09-14 14:52:14 -06:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
 2015-09-14 14:39:03 -06:00
Colton Myers
307d3d05a4 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    salt/modules/yumpkg.py
 2015-09-03 14:24:45 -06:00
Jacob Hammons
ac3bd47440 states/pkgrepo examples, suse installation updates 
Refs #26644
Refs #26638
 2015-09-02 11:37:40 -06:00
Colton Myers
1e1f5f3a95 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/conf.py
    doc/topics/cloud/config.rst
    doc/topics/cloud/index.rst
    salt/modules/git.py
    salt/states/git.py
    salt/states/pkgrepo.py
 2015-09-01 15:35:21 -06:00
Colton Myers
278e8dda5b Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/gce.py
 2015-09-01 15:15:13 -06:00
Jacob Hammons
0ec036350d Updates to salt-ssh and salt-key 
#24510
 2015-08-31 20:00:30 -06:00
Jacob Hammons
45c1ff3543 Add doc for __states__ to writing states topic and 2015.8 release notes. Also added a missing line in release notes for git module updates. 
Refs #21214
 2015-08-31 13:51:31 -06:00
Colton Myers
76c70162db Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/conf.py
    doc/topics/spm/index.rst
    salt/cloud/clouds/gce.py
    salt/cloud/clouds/opennebula.py
    salt/cloud/clouds/openstack.py
    tests/unit/states/file_test.py
 2015-08-26 14:47:33 -06:00
Justin Findlay
1d404bd561 remove trailing whitespace in state top docs 2015-08-26 01:44:33 -06:00
Justin Findlay
a288962ac2 change md code quoting to rst in state top docs 2015-08-26 01:44:33 -06:00
Justin Findlay
559512b0a6 add default_top description to docs 2015-08-26 01:44:33 -06:00
Colton Myers
75f48b4a96 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/topics/targeting/grains.rst
 2015-08-21 16:48:48 -06:00
Colton Myers
2907a64052 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cli/batch.py
    salt/modules/git.py
    salt/utils/event.py
 2015-08-20 13:31:46 -06:00
Jacob Hammons
499bd66378 Minor doc bug fixes 
Refs #26403
Refs #26432
Refs #26233
Refs #26264
Refs #26329
 2015-08-19 11:31:26 -06:00
Colton Myers
73282d51cc Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cli/daemons.py
    salt/master.py
    salt/minion.py
    salt/modules/gpg.py
    salt/modules/pw_group.py
    salt/utils/http.py
    setup.py
    tests/unit/modules/schedule_test.py
 2015-08-19 11:29:45 -06:00
Erik Johnson
56fc78de80 Hide aliased funcs from docs 2015-08-17 17:29:13 -05:00
Seth House
4471c3f237 Add note about top-file only env assignment and the show_top() function 2015-08-11 11:29:33 -06:00
Seth House
5864111429 Minor spelling, style fixes 2015-08-11 11:29:25 -06:00
Mike Place
cfb6982227 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-11 11:28:40 -06:00
Mike Place
889b4d2795 Merge pull request #24878 from cachedout/issue_12483 
Top file enhancements
 2015-08-11 11:24:46 -06:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
 2015-08-10 13:27:31 -06:00
Thomas S Hatch
0e705d2185 add pchanges docs 2015-08-08 09:32:29 -06:00
Seth House
b0d4defa36 Add note about top-file only env assignment and the show_top() function 2015-08-07 16:33:55 -06:00
Seth House
163f377d13 Minor spelling, style fixes 2015-08-07 15:32:19 -06:00
Mike Place
13d544b675 Adding some dictupdate merge tests 
Add new option for top_file_merging_strategy to config

Add master config file option

Adding additional tests

Lexicographical test works

Make default strategy

Simplify to just an option about whether or not to merge

Changes

Implement ordered top files

Implement merge strategies and default top files

Lint

Doc rewrite and start on ordering

Remove debugging

Moving to env_order

Adding env_order

Still writing tests

More tests and docs
 2015-08-07 10:43:19 -06:00
Colton Myers
a4d4f8c5f8 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/cloud/clouds/linode.py
    salt/modules/layman.py
    salt/modules/win_system.py
 2015-08-05 15:30:04 -06:00
Justin Findlay
a83059ca01 fix test mode logic in state docs 2015-08-05 11:29:56 -06:00
Justin Findlay
0fd180e106 add test logic to state reult doc 2015-08-05 09:36:08 -06:00
Ryan Lane
b2a179fc1e Add missing module docs 2015-08-04 16:33:37 -07:00
Thomas S Hatch
0e105e3bb0 Merge pull request #25634 from iamseth/add-zenoss-module 
Add zenoss state and execution modules
 2015-07-28 09:30:45 -06:00
Pedro Algarvio
1010eef5ff Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-27 18:20:50 +01:00
David\ Beitey
f65397036f Fix doc around Include/Exclude for states 2015-07-24 09:42:25 +10:00
Seth Miller
95c0935b06 Add zenoss state and execution modules 
This change adds support for the Zenoss monitoring tool.

The execution module provides support for adding a new device and checking if a device is already in Zenoss.

The state module provides the abililty to set a state of 'monitored' which requires that a device be added to Zenoss.

Tested with Zenoss 4.2.5 Enterprise and likely will work with all in the 4.x series including Core.
 2015-07-22 14:58:28 -05:00
Colton Myers
2cb1189ff9 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/cloud/clouds/opennebula.py
    salt/grains/core.py
 2015-07-22 12:17:58 -06:00
Mike Place
3fe4a75a7f Merge pull request #25578 from davidjb/relative-includes 
Allow parent relative includes in state files
 2015-07-22 10:51:12 -06:00
David\ Beitey
9ad0ddc549 Allow parent relative includes in state files 
This implements the solution to #25477.  Any ``include`` directives
within state files can use multiple dot notation (influenced by Python
relative imports) to refer to a parent state.

This also implements the same functionality inside the stateconf
renderer
(http://docs.saltstack.com/en/latest/ref/renderers/all/salt.renderers.stateconf.html),
which supported relative includes, excludes, and prefixed states.  This
PR expands on existing tests for stateconf.

This also updates the documentation accordingly.
 2015-07-21 16:32:38 +10:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
 2015-07-20 13:55:14 -06:00
David\ Beitey
bfc4f9fd85 Fix typo in extend declaration doco 2015-07-18 14:39:29 +10:00
Seth House
7422385e24 Add autosummary-generated docs 2015-07-17 17:53:16 -06:00
Seth House
1210a53685 Add all new modules to autosummary docs 2015-07-17 15:53:13 -06:00
Pedro Algarvio
f8ee8c1ba9 Merge remote-tracking branch 'upstream/2015.8' into develop 2015-07-16 20:08:28 +01:00
Ben Brady
a6bbfbfe8e return will not work in the context it is being used in - docs are misleading 2015-07-14 14:13:03 -07:00
Colton Myers
2a144b954a Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    doc/ref/states/requisites.rst
    doc/topics/tutorials/states_pt5.rst
    salt/cloud/clouds/ec2.py
    salt/config.py
    salt/minion.py
    salt/modules/cp.py
    salt/pillar/__init__.py
    salt/states/file.py
 2015-07-14 10:57:36 -06:00
Arnold Bechtoldt
3e2edd33d4 refactor elasticsearch integration 
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
 2015-07-14 09:00:26 -06:00
Mike Place
ad0e40d9a1 Merge pull request #24422 from bechtoldt/refactor_es_modules 
Refactor Elasticsearch integration
 2015-07-13 14:46:10 -06:00
Arnold Bechtoldt
8eb2ac1dbe set correct indention in states/requisites.rst (docs), fixes #25281 2015-07-11 18:25:20 +02:00
Arnold Bechtoldt
af16c76422 refactor elasticsearch integration 
* salt.modules.elasticsearch
* salt.states.elasticsearch*
* salt.returners.elasticsearch
 2015-07-11 17:59:07 +02:00
rallytime
1b7efa91e0 Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
rallytime
c0c2463b64 Partial backport of #25019 
Only backport the new .rst files for states that exist in the 2015.5 branch

Refs #25019
 2015-07-06 09:28:43 -06:00
Arnold Bechtoldt
689ba5686b add missing module documentation to references 2015-06-27 19:12:50 +02:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
 2015-06-18 11:43:11 -06:00
mattmb
a5607d5e07 Multiple onchanges requisite behaviour 
Change the onchanges requisite so that if you list multiple onchanges
requisites then only one must change to trigger the state. Currently all
the watched states must change to cause the trigger. This fixes #19592
 2015-06-16 15:02:11 +01:00
Jacob Hammons
c7cdd416a2 Doc bug fixes 
Refs #24547
Refs #24275
Refs #24375
Refs #24560
Refs #24163
 2015-06-12 11:23:52 -06:00
Joe Julian
9cb7015568 Mark keyword version adds 2015-06-09 12:50:24 -07:00
Joe Julian
76e2583265 Merge tls changes from develop 2015-06-09 12:48:36 -07:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop 
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
 2015-06-09 11:41:07 -06:00
Thomas S Hatch
0d9e0c2b8c Merge pull request #24468 from jacobhammons/doc-fixes 
Bug fixes and build errors
 2015-06-08 09:25:40 -06:00
Alexander Schwartz
7d6b60c79d change "path" to "name" for "file" operations 
Path is no supported parameter for any file operation (maybe it has been in the past)
 2015-06-07 13:14:26 +02:00
Jacob Hammons
d45c4ed11f Bug fixes and build errors 
Refs #23211
Refs #24268
Refs #24235
Refs #24193
Refs #24172
Refs #19901
Refs #19801
 2015-06-05 17:32:35 -06:00
Arnold Bechtoldt
fc7f0724d3 add missing module documentation to references 2015-06-04 21:17:24 +02:00
Ryan Lane
a3924bba0e Add boto_kms docs 2015-06-03 15:18:52 -07:00
rallytime
d8daa9dcd7 Merge #24185 with a couple of fixes 
Refs #24185
 2015-05-27 15:25:27 -06:00
Drew Malone
fb0f1080dd Quick note on usability of 'include' statement. 2015-05-20 10:46:03 -04:00
Nitin Madhok
9dc1e0b3ae Fixing sphinx errors and warnings 2015-05-18 12:12:07 -04:00
Thomas S Hatch
d951bc8ad4 Merge pull request #22548 from terminalmage/docker-ng 
Add docker-ng state module
 2015-05-15 12:09:58 -06:00
Daniel Hobley
899ba78e79 Added power cfg module and state for windows minions 
- Allows you to set power settings on a windows minion for things like the monitor and disk
 2015-05-12 14:49:48 +02:00
Forrest
552eb52c7b Add details to first line. 
We don't specify the top.sls in the first sentence which can be mildly confusing.
 2015-05-11 12:24:15 -07:00
David Boucha
10e0a2a0a2 clean up doc a bit 2015-05-05 17:14:57 -06:00
David Boucha
750bae117d add docs for the fire_event state feature 2015-05-05 17:14:57 -06:00
Ryan Lane
f03c68655c Add missing pagerduty and boto docs 2015-05-04 23:31:26 -07:00
Erik Johnson
23a827547c Add docker-ng state docs to toctree 2015-04-30 11:19:37 -05:00
Colton Myers
2210bd175e Merge pull request #22668 from basepi/merge-forward-develop 
Merge forward from 2015.2 to develop
 2015-04-16 23:22:36 -06:00
Erik Johnson
e51a8e0e4a Add external anchor for "reloading modules" section of state docs 2015-04-16 20:17:25 -05:00
Colton Myers
66378be75e Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    doc/ref/states/requisites.rst
    salt/master.py
    salt/modules/win_pkg.py
 2015-04-16 12:27:53 -06:00
Colton Myers
000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
    .pylintrc
    doc/ref/runners/all/salt.runners.nacl.rst
    doc/topics/cloud/config.rst
    salt/cli/salt.py
    salt/client/mixins.py
    salt/client/ssh/__init__.py
    salt/loader.py
    salt/minion.py
    salt/modules/cassandra_cql.py
    salt/modules/gpg.py
    salt/modules/grains.py
    salt/modules/iptables.py
    salt/modules/yumpkg.py
    salt/netapi/rest_cherrypy/app.py
    salt/renderers/pyobjects.py
    salt/returners/mysql.py
    salt/runners/jobs.py
    salt/state.py
    salt/states/file.py
    salt/states/service.py
    salt/utils/minions.py
    tests/integration/__init__.py
    tests/integration/netapi/rest_tornado/test_app.py
    tests/integration/states/cmd.py
 2015-04-16 12:15:44 -06:00
Thomas S Hatch
b20dbb822b fix some bad sls data in a doc 2015-04-16 11:49:35 -06:00
C. R. Oldham
977d9accf0 Allow unless, onlyif, check_cmd to use python_shell=True 2015-04-06 14:20:08 -06:00
Seth House
4cb33c92d6 Added autodoc generated pages for the new modules types 2015-04-03 12:45:49 -06:00
Seth House
ef3893d4de Updated module index pages for each of the module types 2015-04-03 12:39:13 -06:00
Joseph Hall
ba3f6bc32c Merge pull request #22258 from nmadhok/vmware-cloud-driver 
Creating vmware cloud driver
 2015-04-02 07:31:50 -06:00
Nitin Madhok
bfa4ef77e2 Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver 2015-03-31 12:56:19 -04:00
Nitin Madhok
931ece7d20 Fixing some spninx errors and violations 2015-03-31 12:54:32 -04:00
Clint Armstrong
2fd9cf70be Merge branch 'develop' into x509 2015-03-31 11:29:46 -04:00
John Syrinek
663b19e5b7 Improves example illustrating SLS-to-Python mapping 2015-03-30 14:04:05 -05:00
Clint Armstrong
12fa6950fc added state docs 2015-03-26 13:24:07 -04:00
Clint Armstrong
b17eb94168 added state docs 2015-03-26 13:24:03 -04:00
John Syrinek
6558d9e6d7 Fix unless example 
The second `unless` example failed to compile
 2015-03-24 14:02:27 -05:00
Arnold Bechtoldt
db38f80945 update references, fixes #21879 2015-03-22 10:16:41 +01:00
Seth House
714921a5dc Added autosummary placeholders for new models 2015-03-02 22:14:33 -07:00
Seth House
b6c1b2601f Added new modules to the module indexes 2015-03-02 22:13:42 -07:00
Seth House
57b1f67daa Added autosummary generated placeholders for the new module docs 2015-03-02 14:07:18 -07:00
Seth House
1382401618 Updated all the module index pages with the latest/newest modules 2015-03-02 13:59:19 -07:00
Ryan Lane
1bc840a3a9 Add missing boto docs 2015-02-25 12:50:44 -08:00
Alexander Pyatkin
5edb6cba11 Implement Bower state module 2015-02-21 05:57:54 +00:00
Arnold Bechtoldt
88dea95c6c add some cosmetic changes to the state requisites article 2015-02-07 18:46:03 +01:00
Arnold Bechtoldt
eeeff3b393 adding states to doc salt.states reference 2015-01-24 22:35:23 +01:00
Thomas S Hatch
dca509eb0d Merge pull request #19859 from twellspring/develop 
Documentation fix for Issue 19513.
 2015-01-20 16:06:03 -07:00
twellspring
e62e36dd57 Update include.rst 2015-01-19 21:02:26 -08:00
Chris Rebert
19e262bb7b Fix typos with the help of https://github.com/vlajos/misspell_fixer 2015-01-16 13:35:47 -08:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward 
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
 2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency 
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
 2014-12-12 23:36:40 -07:00
Thomas Jackson
8df54973c3 Comma cleanup 2014-12-12 11:34:51 -08:00
Thomas Jackson
d12677156e Whitespace cleanup 2014-12-11 07:53:19 -08:00
Nitin Madhok
f168af05ef Adding state to toctree 2014-12-08 10:50:09 -05:00
Colton Myers
472f6577e2 Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/minion.py
	salt/modules/localemod.py
	salt/states/mount.py
	salt/transport/__init__.py
	salt/utils/schedule.py
 2014-12-04 11:11:11 -07:00
Seth House
54d8760d2d Added docs for the state-level aggregate keyword 
Also added clarification on the two ways to invoke the aggregation
function.
 2014-12-02 18:33:10 -05:00
Pedro Algarvio
50105aa001 Merge branch '2014.7' into develop 
Conflicts:
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	tests/unit/modules/boto_vpc_test.py
 2014-12-01 23:07:39 +00:00
Elias Probst
6a7662c498 Fix typo (agregate → aggregate). 2014-11-29 15:58:07 +01:00
Mike Place
988b8e621d Update docs for unless 
Note that unless is run for each associate state dec.
 2014-11-26 09:17:14 -07:00
Konrad Starzyk
0759323c99 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-25 11:52:27 +01:00
Colton Myers
754baafcf7 Merge branch '2014.7' into develop 2014-11-24 14:38:46 -07:00
Colton Myers
42223567b8 Add warning to docs about topfile compilation 
Ref #12483
 2014-11-24 14:33:37 -07:00
Konrad Starzyk
99406c2215 Merge remote-tracking branch 'upstream/develop' into jboss7 2014-11-20 11:20:41 +01:00
starzyk1
8101b2a8e7 Documentation fixes for jboss7 and artifactory states/modules 2014-11-20 11:16:57 +01:00
Chris Martin
d03a2bf753 Remove an awkward comma splice in the docs. 2014-11-10 20:02:02 -08:00
Thomas S Hatch
b3d2edc9a5 Merge branch '2014.7' into develop 2014-11-04 15:11:23 -07:00
Colton Myers
df0547969f We evaluate a prereq, we don't call it. Fixes #17086 2014-11-04 11:36:30 -07:00
Colton Myers
945e6506b6 Merge branch '2014.7' into develop 2014-10-27 15:32:25 -06:00
Colton Myers
6da0967805 Fix pre-required vs pre-requiring mixups in prereq doc 2014-10-27 10:59:07 -06:00
rallytime
933be7c476 Merge branch '2014.7' into develop 
Conflicts:
	salt/master.py
	salt/returners/mysql.py
	salt/utils/cloud.py
	salt/utils/minions.py
 2014-10-25 08:54:42 -06:00
Thomas S Hatch
cb14a8660e fix docs for mod_aggregate per #16575 2014-10-21 16:37:34 -06:00
Thomas S Hatch
1468c26ec1 Merge branch '2014.7' into develop 
Conflicts:
	doc/faq.rst
	doc/ref/configuration/minion.rst
	salt/minion.py
	salt/states/pkg.py
	salt/transport/__init__.py
 2014-10-13 15:03:33 -06:00
Erik Johnson
af64f17fe4 Minor wording fix in highstate docs 
This fixes some grammar weirdness.
 2014-10-10 22:25:55 -05:00
Seth House
b0615f9bbf Merge remote-tracking branch 'upstream/2014.7' into develop 2014-10-08 14:40:32 -06:00
Colton Myers
000b391f2f State Module, not State Declaration 2014-10-07 19:25:44 -06:00
Jeremy Rosenbaum
4668480dff fixes inconsistent bar/baz variable name in state module example 2014-10-01 21:53:45 -07:00
Thomas S Hatch
3f82e3664a Merge branch '2014.7' into develop 2014-09-23 14:41:58 -06:00
rallytime
872b312770 Clarify unless and onlyif docs 2014-09-22 16:03:04 -06:00
Colton Myers
99e97320e1 Merge branch '2014.7' into develop 
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
 2014-09-22 14:22:54 -06:00
Wolodja Wentland
3925df10d3 Fix indentation errors and inconsistencies 
Documentation for new requirements did not consistently use two spaces for
indentation or even no indentation at all.
 2014-09-18 21:02:56 +02:00
Erik Johnson
f47dd063e3 Fix sphinx build error 2014-09-17 18:00:18 -05:00
Nitin Madhok
197df512bb Doc fixes 2014-09-16 09:54:52 -04:00
Thomas S Hatch
d6e3e01c6d Merge pull request #15392 from ihrwein/f/add-syslog-ng-modules 
F/add syslog ng modules
 2014-09-12 10:37:02 -06:00
Jille Timmermans
a8e3586aa1 Some textual fixes 2014-09-11 14:45:44 +02:00
btibi
69b0deacf6 syslog_ng: add syslog-ng state and execution modules 2014-08-29 23:20:25 +02:00
Ryan Lane
8048b01562 Initial commit of boto_cloudwatch module and boto_cloudwatch_alarm state 2014-08-25 13:37:47 -06:00
Colton Myers
932aa97e1f Merge branch '2014.7' into develop 2014-08-15 16:33:02 -06:00
Seth House
12e87f3545 Don't document the state.event function aliases 2014-08-15 08:31:08 -04:00
Seth House
e2ed04351d Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/modules/npm.py
 2014-08-13 18:56:23 -04:00
Seth House
d85791e3ef Documented the expansion additon to names 
Added docs for the addition in #13489.
 2014-08-13 18:19:02 -04:00
Thomas S Hatch
d352004c01 Merge branch 'boto-cloudwatch' of https://github.com/lyft/salt into lyft-boto-cloudwatch 2014-08-12 11:28:51 -06:00
Nitin Madhok
937a607448 Fixing more sphinx warnings and errors 2014-08-11 12:16:01 -04:00
Ryan Lane
75ef59f60f Initial commit of boto_cloudwatch module and boto_cloudwatch_alarm state 2014-08-07 16:11:55 -07:00
Seth House
8a60ce5351 Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	doc/topics/development/conventions/formulas.rst
 2014-08-07 15:51:49 -04:00
Seth House
b224efc0d2 Added link targets to a few requisite types 2014-08-06 10:39:47 -04:00
Nitin Madhok
61eb4fb041 Fixing YAML state syntax 2014-08-04 21:32:38 -04:00
Seth House
fed58155bc Merge remote-tracking branch 'upstream/2014.7' into develop 2014-07-24 16:04:39 -06:00
Seth House
6517e7f378 Added generated new module docs 2014-07-24 15:56:19 -06:00
Seth House
81af51bf50 Added new module docs 2014-07-24 15:28:11 -06:00
Ryan Lane
d9c70af2df Re-add listen/listen_in documentation 2014-07-24 11:19:38 -07:00
YanChii
3aeb2fa0ab Merge remote-tracking branch 'upstream/develop' into solaris-ips 2014-07-17 16:28:53 +02:00
YanChii
14ff5bc6d1 added Solaris IPS pkg module, updated pkg providers list 2014-07-17 16:28:34 +02:00
rallytime
a8cd830d52 Change "Helium" to 2014.7.0 in affected docs 2014-07-15 16:53:29 -06:00
rallytime
f295b9b60b Fix requisite documentation links 2014-07-14 10:33:02 -06:00
rallytime
29c6171af5 Fix "here" link on requisites doc 2014-07-14 10:13:27 -06:00
Erik Johnson
2849950bce Docs cleanup 
Fixes double-colons by making them code-block directives, so they do not
erroneously show up as "PYTHON" blocks. Also corrects a few instances of
2nd person pronoun usage.
 2014-07-13 11:02:33 -05:00
Ryan Lane
0306ed00b8 Combine requisites and alterting_states into a global state arguments document 2014-07-10 14:59:12 -07:00
btibi
f69977d3e5 Add syslog_ng state module. 2014-07-09 22:04:13 +02:00
Seth House
7725350416 Merge pull request #13811 from lyft/doc-additions 
Add docs for boto_elasticache and apache_module
 2014-06-27 17:10:10 -06:00
Ryan Lane
bffc4f1fb4 Add missing generated rst 2014-06-11 18:18:31 -07:00
Erik Johnson
ee0d14d989 Add new module/state to toctree 2014-06-11 18:06:12 -05:00
Ryan Lane
16c83d24bf Add docs for boto_elasticache and apache_module 2014-06-11 15:52:31 -07:00
Colton Myers
426ebcbc4d More requisite doc cleanup 2014-06-05 16:24:59 -06:00
Colton Myers
5938016c85 Small clarification fix 2014-06-04 16:11:29 -06:00
Colton Myers
cd6617107e Revamp the `watch` requisite docs 2014-06-04 16:01:28 -06:00
Colton Myers
43c26360ee Use correct case for requisites (even in titles) 2014-06-04 15:48:00 -06:00
Thomas S Hatch
2885907854 Merge pull request #13051 from gtmanfred/onlyif 
Add documentation on altering states.
 2014-05-27 16:18:57 -06:00
Daniel Wallace
a31ed6b1c7 ref to altering_states 2014-05-27 16:51:09 -05:00
Seth House
39a98e0aba Added link target for the requisites doc 2014-05-27 14:20:27 -06:00
Daniel Wallace
f393569c44 add Helium note 2014-05-27 13:55:31 -05:00
Daniel Wallace
b767d340ee Add documentation on altering states. 2014-05-27 13:14:42 -05:00
Seth House
e150b9fc61 Added missing versionadded to onchanges requisite 
Thanks to agronholm on IRC.
 2014-05-21 18:46:35 -06:00
Ryan Lane
92f21c7b05 Adding boto_* modules and states to documentation. 2014-05-20 18:06:17 -04:00
Seth House
59f2d07ffb Bunch of misc rST fixes 2014-05-14 12:02:55 -06:00
KennethWilke
bd18389507 moar docs, moar betta 2014-05-13 15:07:30 -05:00
Thomas S Hatch
af58d29ab6 Add initial docs on onchanges and onfail 2014-05-07 16:02:36 -06:00
Thomas S Hatch
2bcad0c037 iAdd initial mod_aggregate docs 2014-05-05 16:23:09 -06:00
Thomas S Hatch
0606f4b78c initial docs for the mod_aggregate system 2014-05-05 16:00:17 -06:00
Chris Rebert
7d1df94bb1 copyedit ref docs 2014-04-30 14:08:31 -07:00
rallytime
12d5d87451 Some grammatical changes 2014-04-21 13:48:35 -06:00
rallytime
5789d4800c Clarifications for require, watch, and prereq in requisites documentation 2014-04-21 13:40:00 -06:00
Seth House
14515c3c8b Added generated templates for the new additions 2014-04-17 12:20:07 -06:00
Seth House
d2f057b0fd Combed through all the module types to add recent additions to the docs 2014-04-17 12:16:26 -06:00
rallytime
315247f208 Name consistency 2014-04-16 14:26:59 -06:00
rallytime
5354290157 Small yaml fix 2014-04-16 14:25:07 -06:00
rallytime
51bb1d31e6 Updated Requisites doc and added more explanation and examples to watch_in 2014-04-16 14:19:03 -06:00
Seth House
e222a9bd1c Add missing True return to state example when state is already correct 2014-04-15 15:51:43 -06:00
Pedro Algarvio
2b2754d683 Don't encourage bad **kwargs usage. 2014-04-13 14:38:04 +01:00
Seth House
640f613364 Added a full but simplistic example of writing a state module 2014-04-11 14:08:53 -06:00
Colton Myers
5b6b30e896 Add note about multiple extends of a single state 2014-04-03 15:19:34 -06:00
Erik Johnson
83063c8d68 Fix broken links and other sphinx errors 2014-03-17 17:17:18 -05:00
Mike Place
fc89a3e9c4 Rename state ordering section 2014-03-14 14:19:32 -06:00
Thomas S Hatch
58676463d8 Merge pull request #11218 from terminalmage/docs 
New module busywork for htpasswd state/module
 2014-03-13 21:06:06 -06:00
Erik Johnson
19663ee9bf Add htpasswd state to docs 2014-03-13 21:43:58 -05:00
Erik Johnson
fc062e5d27 Move OverState and state.sls docs to new location 2014-03-13 20:59:28 -05:00
Nicolas Delaby
2925e7618d add reference to htpasswd module in states index 2014-02-28 09:27:13 +01:00
Seth House
86e0075fcf Updated tutorials, highstate, and PyDSL docs from term links to ref 2014-02-27 19:43:12 -07:00
Seth House
46c1f24f8a Added ref anchor for highstate docs 2014-02-27 19:38:57 -07:00
Seth House
21d4092c77 Added ref anchor for overstate docs 2014-02-27 19:38:57 -07:00
Seth House
fdfda7869e Added ref anchors to state layers doc 2014-02-27 19:38:57 -07:00
Seth House
c29f9205ad Added ref anchors for the top file and environments 2014-02-27 19:38:57 -07:00
Seth House
276d05b464 Added ref anchors for the ordering sections 2014-02-27 19:38:57 -07:00
Seth House
bf9ae06cc6 Removed old, scattered glossary entries 2014-02-27 19:38:56 -07:00
Mike Place
2637fc689f Docs build cleanly! Yay! 2014-02-26 13:32:33 -07:00
Mike Place
6af7ff5dff First pass at refactoring Salt documentation. 2014-02-26 13:31:11 -07:00
Mike Place
a485eceac9 Fix all broken links in docs. Ignore certain known-good links. Adjust many links that are returning 301. 
Conflicts:
	doc/topics/installation/index.rst
 2014-02-20 16:16:59 -07:00
Mike Place
362931561d States index re-write for clarity. 2014-02-19 15:36:14 -07:00
Ted Strzalkowski
e2949d865d Updated requisites docs to only monospace sls keys 2014-01-31 19:54:21 -08:00
Dan Garthwaite
1edaf7c345 states_run_on_minions_8389 2014-01-31 12:43:51 -05:00
Forrest Alvarez
db01d53d53 Updated requisite docs to try and clarify issues regarding the difference between requisite, and requisite_in. 2014-01-28 04:31:25 +00:00
Thomas S Hatch
4fd5512685 clean out extra whitespace 2014-01-27 10:30:45 -07:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi 
Run codespell[1] against sources.

[1] https://github.com/lucasdemarchi/codespell
 2014-01-26 18:41:28 -08:00
Mathieu Le Marec - Pasquet
7039b4c974 postgres: support for extensions 2014-01-21 19:25:35 +01:00
Thomas S Hatch
70f637d1a1 Clarify require document 2014-01-20 12:08:59 -07:00
Erik Johnson
f636d1d4ed Fix refs to yumpkg5 2014-01-17 21:08:44 -06:00
Erik Johnson
f38793166c Alias module.watch to module.wait 
This was done recently for cmd.watch, so this commit aliases the
module.watch state as well for consistency.
 2013-12-30 17:34:55 -06:00
Erik Johnson
ddad8760a5 Add new pagerduty module/state to docs 2013-12-25 08:45:26 -06:00
Erik Johnson
4f6d448af5 Add new XMPP module/state to docs 2013-12-24 17:58:09 -06:00
Erik Johnson
12c0df5123 Hide cmd.watch state alias from docs 2013-12-23 11:23:16 -06:00
Seth House
a0ef5f7964 Updated doc title to reflect actual module name 
Refs #9366
 2013-12-20 15:35:28 -07:00
Colton Myers
d61a93fde5 Document availability of templating variables, Fix #9261 2013-12-18 11:13:21 -07:00
Erik Johnson
1aeec6fbae Fix example in template variable reference docs 2013-12-14 14:22:30 -06:00
Erik Johnson
c88269351b Remove references to yumpkg in documentation 2013-12-13 18:01:34 -06:00
Seth House
e6ed5e2889 Added docs for new execution and state modules 2013-12-12 23:29:56 -07:00
Seth House
e252ee8f8a Updated docs for buildout -> zcbuildout rename 2013-12-12 23:29:56 -07:00
Forrest Alvarez
52e6d273f6 updated the faq to add a note about backup_mode, fixed a typo in the backup mode docs, and updated one of the file.managed examples with a backup line, as well as an additional note directing the user to the backup mode documentation in a highly visible area. 2013-12-08 05:52:45 +00:00
Thomas S Hatch
77d61d92a4 Merge pull request #8914 from makinacorpus/issue-8856-buildout-support 
feat: buildout support
 2013-12-03 09:56:59 -08:00
Joe Healy
45525b4b59 Doc fixes to remove errors and warnings 2013-12-01 18:29:16 +11:00
Mathieu Le Marec - Pasquet
228c987b76 feat: buildout support 
This fixes #8856.
 2013-11-29 18:51:20 +00:00
regilero
1e855fdef1 Document the fact use does not inherit requisites, @ref #8796 2013-11-27 09:41:34 +01:00
Joseph Hall
0765eeb983 Merge pull request #8728 from basepi/watchdocs 
Add some additional docs for `cmd.wait` for the watch requisite
 2013-11-21 14:02:58 -08:00