827ed47a25
Jinja macros are not actually functions. The only thing they can return is a string. In order to return structured data, the callee must serialize it, and the caller must deserialize it. This state formula uses YAML as the intermediary, hence the occurrence of both the `|yaml` (callee) and `|load_yaml` (caller) filters in its code. The post-render "mapping values are not allowed here" error in *salt/formulas.sls* or the broken rendering of *salt/files/master.d/f_defaults.conf* happens because invocations of the `formulas_git_opt` macro in several Jinja `set` statements do not get deserialized, resulting in the trailing newline followed by three dot characters (`...`), which YAML uses to signal the end of a document. Correcting these rendering errors requires adding the necessary deserialization code at those locations (i.e., filtering the macro call through `|load_yaml`).
46 lines
1.4 KiB
Plaintext
46 lines
1.4 KiB
Plaintext
{% set processed_gitdirs = [] %}
|
|
{% set processed_basedirs = [] %}
|
|
|
|
{% from "salt/formulas.jinja" import formulas_git_opt with context %}
|
|
|
|
# Loop over all formulas listed in pillar data
|
|
{% for env, entries in salt['pillar.get']('salt_formulas:list', {}).iteritems() %}
|
|
{% for entry in entries %}
|
|
|
|
{% set basedir = formulas_git_opt(env, 'basedir')|load_yaml %}
|
|
{% set gitdir = '{0}/{1}'.format(basedir, entry) %}
|
|
{% set update = formulas_git_opt(env, 'update')|load_yaml %}
|
|
|
|
# Setup the directory hosting the Git repository
|
|
{% if basedir not in processed_basedirs %}
|
|
{% do processed_basedirs.append(basedir) %}
|
|
{{ basedir }}:
|
|
file.directory:
|
|
{%- for key, value in salt['pillar.get']('salt_formulas:basedir_opts',
|
|
{'makedirs': True}).iteritems() %}
|
|
- {{ key }}: {{ value }}
|
|
{%- endfor %}
|
|
{% endif %}
|
|
|
|
# Setup the formula Git repository
|
|
{% if gitdir not in processed_gitdirs %}
|
|
{% do processed_gitdirs.append(gitdir) %}
|
|
{% set options = formulas_git_opt(env, 'options')|load_yaml %}
|
|
{% set baseurl = formulas_git_opt(env, 'baseurl')|load_yaml %}
|
|
{{ gitdir }}:
|
|
git.latest:
|
|
- name: {{ baseurl }}/{{ entry }}.git
|
|
- target: {{ gitdir }}
|
|
{%- for key, value in options.iteritems() %}
|
|
- {{ key }}: {{ value }}
|
|
{%- endfor %}
|
|
- require:
|
|
- file: {{ basedir }}
|
|
{%- if not update %}
|
|
- unless: test -e {{ gitdir }}
|
|
{%- endif %}
|
|
{% endif %}
|
|
|
|
{% endfor %}
|
|
{% endfor %}
|