saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #31004 from rallytime/fix-30993

Browse source 
Remove overstate docs and a few references.
This commit is contained in:
Mike Place 2016-02-08 10:08:24 -07:00
commit 811461e4b4
3 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/ref/states/layers.rst
View file

@ -78,7 +78,7 @@ the json, yaml, or pprint outputters:
.. _state-layers-sls:
SLS
====
===
Above "High Data", the logical layers are no longer technically required to be
executed, or to be executed in a hierarchy. This means that how the High data
@ -122,13 +122,13 @@ To execute the High State call ``state.highstate``:
salt '*' state.highstate
.. _state-layers-overstate:
.. _state-layers-orchestrate:
OverState
=========
Orchestrate
===========
The overstate layer expresses the highest functional layer of Salt's automated
The orchestrate layer expresses the highest functional layer of Salt's automated
logic systems. The Overstate allows for stateful and functional orchestration
of routines from the master. The overstate defines in data execution stages
of routines from the master. The orchestrate defines in data execution stages
which minions should execute states, or functions, and in what order using
requisite logic.

7
doc/ref/states/overstate.rst
View file

@ -1,7 +0,0 @@
================
OverState System
================
.. note::
This documentation has been moved :ref:`here <states-overstate>`.

2
doc/topics/tutorials/states_pt5.rst
View file

@ -32,7 +32,7 @@ The Orchestrate Runner
The Orchestrate Runner was added with the intent to eventually deprecate the
OverState system, however the OverState will still be maintained until Salt
Boron.
2015.8.0.
The orchestrate runner generalizes the Salt state system to a Salt master
context. Whereas the ``state.sls``, ``state.highstate``, et al functions are