Salt
/
salt-formula
mirror of https://github.com/saltstack-formulas/salt-formula.git
0
0
Fork 0
Code Issues Activity

Tidy up comments, add some docs/examples.

This commit is contained in:
Matthew Richardson 2016-08-23 09:48:39 +01:00
parent 5abdaee5a2
commit 89ece150e6
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -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.
:: ::

4
pillar.example
View File

@ -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

2
salt/files/minion.d/f_defaults.conf
View File

@ -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 }}