Browse Source

Tidy up comments, add some docs/examples.

tags/v0.57.0
Matthew Richardson 8 years ago
parent
commit
89ece150e6
3 changed files with 5 additions and 3 deletions
  1. +1
    -1
      README.rst
  2. +4
    -0
      pillar.example
  3. +0
    -2
      salt/files/minion.d/f_defaults.conf

+ 1
- 1
README.rst View File



``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
- 0
pillar.example View File

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

+ 0
- 2
salt/files/minion.d/f_defaults.conf View File

{% 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 }}

Loading…
Cancel
Save