Merge pull request #33503 from rallytime/fix-15252

Add docs about minion config file in standalone minion docs
This commit is contained in:
Mike Place 2016-05-25 10:23:07 -07:00
commit ee76be3b0b

View file

@ -17,6 +17,20 @@ things:
Otherwise, it will attempt to connect to a master and fail. The salt-call
command stands on its own and does not need the salt-minion daemon.
Minion Configuration
--------------------
Throughout this document there are several references to setting different
options to configure a masterless Minion. Salt Minions are easy to configure
via a configuration file that is located, by default, in ``/etc/salt/minion``.
Note, however, that on FreeBSD systems, the minion configuration file is located
in ``/usr/local/etc/salt/minion``.
You can learn more about minion configuration options in the
:ref:`Configuring the Salt Minion <configuration-salt-minion>` docs.
Telling Salt Call to Run Masterless
===================================
@ -39,7 +53,6 @@ Now the salt-call command will not look for a master and will assume that the
local system has all of the file and pillar resources.
Running States Masterless
=========================
@ -81,6 +94,7 @@ it unnecessary to change the configuration file:
salt-call state.apply --local
External Pillars
================