Commit Graph

78 Commits

Author SHA1 Message Date
Michael Lustfield
edb43183ec Updating from deprecated syntax 2016-09-26 16:50:00 -07:00
Michael Lustfield
88fc5d4a38 Adding information to avoid blocking master processes 2016-09-26 16:48:43 -07:00
Michael Lustfield
bdecd2c140 Updated example
While technically correct, I felt the example caused assumptions that generated confusion later in the text.
2016-09-26 16:38:56 -07:00
rallytime
d679c09e65 Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/config/__init__.py
  - salt/utils/parsers.py
  - tests/unit/config/config_test.py
2016-07-18 10:34:03 -06:00
rallytime
cca9446c37 Various spelling fixes
Fixes #34630
2016-07-16 13:17:09 -06:00
rallytime
49f40e9d99 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/conf.py
  - doc/topics/reactor/index.rst
  - tests/integration/__init__.py
2016-07-12 16:13:56 -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
Chandler
fececb5663 Delete extra space (#33072) 2016-05-05 11:11:33 -06:00
Chandler
fb11e5873c Add reactor documentation (#33034)
* Add gitfs info to reactors page

* Add gitfs info to reactors page

* Update index.rst
2016-05-05 07:15:52 -07:00
rallytime
d684d49490 Merge branch '2016.3' into 'develop'
Conflicts:
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/releases/2015.8.8.rst
2016-03-28 11:16:22 -06:00
rallytime
f6d9cdc633 Merge branch '2015.8' into '2016.3'
Conflicts:
  - doc/ref/states/compiler_ordering.rst
  - doc/topics/installation/suse.rst
  - doc/topics/jobs/schedule.rst
  - doc/topics/targeting/grains.rst
  - doc/topics/tutorials/preseed_key.rst
  - doc/topics/tutorials/states_pt5.rst
  - pkg/suse/use-forking-daemon.patch
  - salt/minion.py
  - salt/modules/pacman.py
  - salt/modules/state.py
  - salt/modules/yumpkg.py
2016-03-25 11:47:16 -06:00
rallytime
7554d0f42d Merge branch '2015.5' into '2015.8'
Conflicts:
  - doc/ref/states/include.rst
  - doc/topics/cloud/reactor.rst
  - doc/topics/reactor/index.rst
  - doc/topics/releases/2015.5.10.rst
  - doc/topics/tutorials/states_pt5.rst
  - doc/topics/windows/windows-package-manager.rst
  - salt/config.py
  - salt/modules/state.py
  - salt/states/grains.py
  - tests/integration/modules/sysmod.py
  - tests/unit/states/grains_test.py
2016-03-24 15:48:00 -06:00
Erik Johnson
1b97e4a3df Improve state module docs, replace references to state.highstate/state.sls with state.apply
Resolves #32037.
2016-03-21 22:56:17 -05:00
Daniel Wallace
197fc2b58d Add reactor to engines
For use with the event bus on minions.

Closes #15265
2016-03-11 08:34:16 -07:00
rallytime
031a75ca33 Merge branch '2015.8' into '2016.3'
Conflicts:
  - Contributing.rst
  - conf/master
  - doc/index.rst
  - doc/man/salt.7
  - pkg/suse/README.suse
  - salt/client/ssh/state.py
  - salt/minion.py
  - salt/modules/zypper.py
  - salt/utils/schedule.py
  - tests/unit/modules/zypper_test.py
2016-03-02 10:26:13 -07:00
Denys Havrysh
aebc48163d Remove trailing white spaces in documentation files 2016-03-01 17:36:23 +02:00
Seth House
7cc7a97b91 Clarified render step from worker pool step 2015-12-23 13:48:55 -07:00
Seth House
75a95f5154 Add to Reactor docs to illustrate the end-goal and use with Orchestrate 2015-12-22 15:17:44 -07:00
Seth House
028f000743 Update opening Reactor paragraph for conciseness
We're far removed from 0.11 now so the extra exposition is just noise.
2015-12-22 13:38:33 -07:00
Steve Hajducko
5ff8a83009 Clarify argument usage for runners in reactors
Clarified that positional arguments don't work in runners currently and
that you must use keyword args. Fixes #27770

Also, modified the link to point at the function the example shows,
rather than the previous example.
2015-10-09 21:22:54 -07: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
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
Jacob Hammons
2401533d9e New content added to beacon docs. 2015-09-09 11:16:55 -06:00
rallytime
0214daad19 Fix a couple of typos in reactor docs 2015-09-08 14:52:38 -06:00
Colton Myers
667dfcee14 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/renderers/gpg.py
    tests/integration/loader/loader.py
2015-08-21 16:44:59 -06:00
Arthur Lutz
0976b1e23b [doc] reactor documentation fix : returners 2015-08-21 09:46:04 -06:00
Arthur Lutz
337b466b11 [doc] reactor documentation fix : returners 2015-08-21 11:45:39 +02:00
David Ward
7b8096b945 Grammar fix. 2015-07-27 17:02:31 +10:00
Mike Place
7dae045b3c Remove overstate documentation 2015-06-12 13:00:08 -06:00
Vladimir Pouzanov
921aaea9b4 Fixed a Runenr typo in the docs 2015-05-03 18:47:15 +01:00
Seth House
35c91881ab Added note about debugging reactor files to see the rendered output 2015-04-28 14:48:38 -06:00
Colton Myers
25f9b2d2d1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
    doc/topics/cloud/action.rst
    doc/topics/cloud/function.rst
    doc/topics/reactor/index.rst
2015-04-07 10:05:35 -06:00
Seth House
a8bdc17bbf Better explanations and more examples of how the Reactor calls functions
Refs #20841
2015-04-02 17:07:22 -06:00
Justin Findlay
dae5e2ddc6 Merge remote-tracking branch 'salt/2014.7' into 2015.2
Conflicts:
	doc/topics/reactor/index.rst
	salt/modules/publish.py
	salt/modules/systemd.py
	salt/payload.py
2015-02-18 11:33:10 -07:00
Seth House
37017a54be Replace doc examples for event.fire_master with event.send 2015-02-12 17:28:21 -07:00
Seth House
f0b5ddb77d Updated Reactor docs to reference state.event instead of eventlisten
Easier than downloading an external script.
2015-02-12 17:24:22 -07:00
Thomas Jackson
498a612078 Whitespace cleanup
Conflicts:
	doc/topics/cloud/linode.rst
	doc/topics/cloud/misc.rst
	doc/topics/cloud/parallels.rst
	doc/topics/cloud/proxmox.rst

Conflicts:
	doc/topics/development/architecture.rst
	doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
JP Viljoen
6f3a1ab7b3 [docs] fix minor typo 2014-12-07 10:24:49 +02: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
Seth House
1faec87514 Added versionadded and versionchanged directives to Reactor docs
Also reworded and cross-linked the client interfaces docs.
2014-10-22 15:07:05 -06:00
Pedro Algarvio
229eb00e8d Merge branch '2014.7' forward into develop
Conflicts fixed.

Conflicts:
	salt/loader.py
	salt/returners/carbon_return.py
	salt/returners/couchbase_return.py
	salt/returners/couchdb_return.py
	salt/returners/elasticsearch_return.py
	salt/returners/local_cache.py
	salt/returners/memcache_return.py
	salt/returners/mongo_future_return.py
	salt/returners/mongo_return.py
	salt/returners/mysql.py
	salt/returners/odbc.py
	salt/returners/postgres.py
	salt/returners/redis_return.py
	salt/returners/smtp_return.py
	salt/returners/sqlite3_return.py
	salt/states/dockerio.py
	salt/utils/minions.py
2014-10-19 18:21:19 +01:00
Seth House
4846dcebbd Update the Reactor docs to use the local method instead of cmd 2014-10-17 09:17:34 -05:00
Valentin Bud
d0e962c832 Use custom returner from a reactor. 2014-09-10 10:00:06 +03:00
Seth House
4abc45397d Merge remote-tracking branch 'upstream/2014.7' into develop 2014-08-21 13:23:52 -06:00
Seth House
c05f250d96 Add salt:// paths for reactor files to the doc examples 2014-08-20 21:14:29 -06:00
Seth House
30e8fb653a Line up comments in reactor example 2014-08-20 21:14:29 -06:00
Seth House
2cd0fa6223 Document that globs can be used in reactor filenames 2014-08-20 21:14:29 -06:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
2014-08-11 10:46:43 -07:00
Erik Johnson
7dc67a7ce8 Convert :: to code-block 2014-07-06 16:43:51 -05:00