Skip to content
Snippets Groups Projects
Commit 89ece150 authored by Matthew Richardson's avatar Matthew Richardson
Browse files

Tidy up comments, add some docs/examples.

parent 5abdaee5
No related branches found
No related tags found
No related merge requests found
...@@ -120,7 +120,7 @@ you control, then you can safely enable the ...@@ -120,7 +120,7 @@ you control, then you can safely enable the
``Configuration`` ``Configuration``
================= =================
Every option available in the templates can be set in pillar. Settings under 'salt' will be overridden by more specific settings under ``salt['master']``, ``salt['minion']`` or ``salt['cloud']`` Every option available in the templates can be set in pillar. Settings under 'salt' will be overridden by more specific settings under ``salt['master']``, ``salt['minion']`` or ``salt['cloud']``. Options specified in ``salt['minion']`` which are not present in the default configuration file will be added to the end of the configuration file.
:: ::
......
...@@ -132,6 +132,10 @@ salt: ...@@ -132,6 +132,10 @@ salt:
mine_functions: mine_functions:
network.interface_ip: [eth0] network.interface_ip: [eth0]
# other 'non-default' config
auth_keytab: /root/auth.keytab
auth_principal: kadmin/admin
# salt cloud config # salt cloud config
cloud: cloud:
master: salt master: salt
......
...@@ -1021,8 +1021,6 @@ alternative.mongo.{{ name }}: {{ value }} ...@@ -1021,8 +1021,6 @@ alternative.mongo.{{ name }}: {{ value }}
{% endif %} {% endif %}
{%- endif %} {%- endif %}
############ Other settings ############
##########################################
{%- for configname in cfg_minion %} {%- for configname in cfg_minion %}
{%- if configname not in reserved_keys and configname not in default_keys %} {%- if configname not in reserved_keys and configname not in default_keys %}
{{ configname }}: {{ cfg_minion[configname]|json }} {{ configname }}: {{ cfg_minion[configname]|json }}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment