Skip to content

Commit

Permalink
Merge pull request saltstack#49184 from ralish/external_nodes_docs
Browse files Browse the repository at this point in the history
Remove obsolete documentation on external_nodes setting
  • Loading branch information
Mike Place committed Aug 18, 2018
2 parents 65205a4 + 4fe38dc commit f8c55b8
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 54 deletions.
6 changes: 0 additions & 6 deletions conf/master
Original file line number Diff line number Diff line change
Expand Up @@ -529,12 +529,6 @@
#
#master_tops: {}

# The external_nodes option allows Salt to gather data that would normally be
# placed in a top file. The external_nodes option is the executable that will
# return the ENC data. Remember that Salt will look for external nodes AND top
# files and combine the results if both are enabled!
#external_nodes: None

# The renderer to use on the minions to render the state data
#renderer: yaml_jinja

Expand Down
6 changes: 0 additions & 6 deletions conf/suse/master
Original file line number Diff line number Diff line change
Expand Up @@ -528,12 +528,6 @@ syndic_user: salt
#
#master_tops: {}

# The external_nodes option allows Salt to gather data that would normally be
# placed in a top file. The external_nodes option is the executable that will
# return the ENC data. Remember that Salt will look for external nodes AND top
# files and combine the results if both are enabled!
#external_nodes: None

# The renderer to use on the minions to render the state data
#renderer: yaml_jinja

Expand Down
25 changes: 0 additions & 25 deletions doc/man/salt.7
Original file line number Diff line number Diff line change
Expand Up @@ -6885,25 +6885,6 @@ master_tops:
.fi
.UNINDENT
.UNINDENT
.SS \fBexternal_nodes\fP
.sp
Default: None
.sp
The external_nodes option allows Salt to gather data that would normally be
placed in a top file from and external node controller. The external_nodes
option is the executable that will return the ENC data. Remember that Salt
will look for external nodes AND top files and combine the results if both
are enabled and available!
.INDENT 0.0
.INDENT 3.5
.sp
.nf
.ft C
external_nodes: cobbler\-ext\-nodes
.ft P
.fi
.UNINDENT
.UNINDENT
.SS \fBrenderer\fP
.sp
Default: \fByaml_jinja\fP
Expand Down Expand Up @@ -14770,12 +14751,6 @@ and \fBmine_functions\fP\&.
#
#master_tops: {}

# The external_nodes option allows Salt to gather data that would normally be
# placed in a top file. The external_nodes option is the executable that will
# return the ENC data. Remember that Salt will look for external nodes AND top
# files and combine the results if both are enabled!
#external_nodes: None

# The renderer to use on the minions to render the state data
#renderer: yaml_jinja

Expand Down
17 changes: 0 additions & 17 deletions doc/ref/configuration/master.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1918,23 +1918,6 @@ following configuration:
master_tops:
ext_nodes: <Shell command which returns yaml>
.. conf_master:: external_nodes

``external_nodes``
------------------

Default: None

The external_nodes option allows Salt to gather data that would normally be
placed in a top file from and external node controller. The external_nodes
option is the executable that will return the ENC data. Remember that Salt
will look for external nodes AND top files and combine the results if both
are enabled and available!

.. code-block:: yaml
external_nodes: cobbler-ext-nodes
.. conf_master:: renderer

``renderer``
Expand Down

0 comments on commit f8c55b8

Please sign in to comment.