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

Changed where to mention the map files compatibility for minion configuration options.

Browse source 
This is a result of @Ch3LL suggestion on the PR itself for this doc change.
This commit is contained in:
Alan Cugler 2019-03-27 12:26:52 -05:00
parent 364ef065e8
commit 9ca0f72308
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/topics/cloud/config.rst
View file

@ -27,10 +27,8 @@ cloud is operating on.
Minion Configuration
====================
The default minion configuration is set up in this file or alternatively used in
any ``.conf`` file listed in the ``/etc/salt/cloud.maps.d/``
:ref:`map file <salt-cloud-map>` directory. Minions created by salt-cloud
traditionally derive their configuration from this file. Almost all parameters
The default minion configuration is set up in this file. Minions created by
salt-cloud derive their configuration from this file. Almost all parameters
found in :ref:`Configuring the Salt Minion <configuration-salt-minion>` can be
used here.
@ -46,7 +44,7 @@ and its listening port, if the port is not set to the default.
Similar to most other settings, Minion configuration settings are inherited
across configuration files. For example, the master setting might be contained
in the main ``cloud`` configuration file as demonstrated above, but additional
settings can be placed in the provider or profile:
settings can be placed in the provider, profile or map configuration files:
.. code-block:: yaml