From 89ece150e61c91e31e1bdb3af9b249fbd5d0fe56 Mon Sep 17 00:00:00 2001 From: Matthew Richardson Date: Tue, 23 Aug 2016 09:48:39 +0100 Subject: [PATCH] Tidy up comments, add some docs/examples. --- README.rst | 2 +- pillar.example | 4 ++++ salt/files/minion.d/f_defaults.conf | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.rst b/README.rst index 67e3294..a034960 100644 --- a/README.rst +++ b/README.rst @@ -120,7 +120,7 @@ you control, then you can safely enable the ``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. :: diff --git a/pillar.example b/pillar.example index 0e7486c..4b0938a 100644 --- a/pillar.example +++ b/pillar.example @@ -132,6 +132,10 @@ salt: mine_functions: network.interface_ip: [eth0] + # other 'non-default' config + auth_keytab: /root/auth.keytab + auth_principal: kadmin/admin + # salt cloud config cloud: master: salt diff --git a/salt/files/minion.d/f_defaults.conf b/salt/files/minion.d/f_defaults.conf index 172927b..4178d42 100644 --- a/salt/files/minion.d/f_defaults.conf +++ b/salt/files/minion.d/f_defaults.conf @@ -1021,8 +1021,6 @@ alternative.mongo.{{ name }}: {{ value }} {% endif %} {%- endif %} -############ Other settings ############ -########################################## {%- for configname in cfg_minion %} {%- if configname not in reserved_keys and configname not in default_keys %} {{ configname }}: {{ cfg_minion[configname]|json }}