From 79fcda8806c6e92ebbcedd355fc49b0bd0473a5e Mon Sep 17 00:00:00 2001 From: "Jeremy T. Bouse" Date: Sun, 4 Sep 2016 14:48:10 +0000 Subject: [PATCH] Clean up formating of nodegroups --- salt/files/master.d/f_defaults.conf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/salt/files/master.d/f_defaults.conf b/salt/files/master.d/f_defaults.conf index 3a9bc76..6550c56 100644 --- a/salt/files/master.d/f_defaults.conf +++ b/salt/files/master.d/f_defaults.conf @@ -1282,17 +1282,17 @@ log_granular_levels: #nodegroups: # group1: 'L@foo.domain.com,bar.domain.com,baz.domain.com and bl*.domain.com' # group2: 'G@os:Debian and foo.domain.com' -{% if 'nodegroups' in cfg_master %} +{%- if 'nodegroups' in cfg_master %} nodegroups: - {% for name, lvl in cfg_master['nodegroups'].items() %} + {%- for name, lvl in cfg_master['nodegroups'].items() %} {{ name }}: {{ lvl }} - {% endfor %} -{% elif 'nodegroups' in cfg_salt %} + {%- endfor %} +{%- elif 'nodegroups' in cfg_salt %} nodegroups: - {% for name, lvl in cfg_salt['nodegroups'].items() %} + {%- for name, lvl in cfg_salt['nodegroups'].items() %} {{ name }}: {{ lvl }} - {% endfor %} -{% endif %} + {%- endfor %} +{%- endif %} ##### Range Cluster settings ##### ##########################################