From 922135df31875e928e75dc5ad18dcaba7cb3ae0f Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Fri, 15 Feb 2019 04:28:51 +0000 Subject: [PATCH] Improve reformating of `formulas.sls` Jinja --- salt/formulas.sls | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/salt/formulas.sls b/salt/formulas.sls index cee19fc..4675ea2 100644 --- a/salt/formulas.sls +++ b/salt/formulas.sls @@ -28,10 +28,8 @@ {%- do processed_basedirs.append(basedir) %} {{ basedir }}: file.directory: - {%- for key, value in salt['pillar.get']( - 'salt_formulas:basedir_opts', - {'makedirs': True} - ).items() %} + {%- for key, value in salt['pillar.get']('salt_formulas:basedir_opts', + {'makedirs': True}).items() %} - {{ key }}: {{ value }} {%- endfor %} {%- endif %} @@ -52,9 +50,9 @@ {%- endfor %} - require: - file: {{ basedir }} - {%- if not update %} + {%- if not update %} - onlyif: rm -fr {{ gitdir }} >/dev/null 2>&1 | true - {%- endif %} + {%- endif %} {%- endif %} {%- endfor %} {%- endfor %}