saltstack-formulas/salt-formula
Template
2
0
Fork 0
Code Releases Activity

Merge pull request #176 from irtnog/fix-formulas-mapping-values-not-allowed-render-error

Browse Source 
Filter all calls to formulas_git_opt through load_yaml
This commit is contained in:
Brian Jackson 2015-09-03 14:28:56 -05:00
commit 32d2de264f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/formulas.jinja
View File

@ -17,7 +17,8 @@
{%- macro formulas_roots(env) -%} {%- macro formulas_roots(env) -%}
{%- set value = [] -%} {%- set value = [] -%}
{%- for dir in formulas.get(env, []) -%} {%- for dir in formulas.get(env, []) -%}
{%- do value.append('{0}/{1}'.format(formulas_git_opt(env, 'basedir'), dir)) -%} {%- set basedir = formulas_git_opt(env, 'basedir')|load_yaml -%}
{%- do value.append('{0}/{1}'.format(basedir, dir)) -%}
{%- endfor -%} {%- endfor -%}
{{ value|yaml }} {{ value|yaml }}
{%- endmacro -%} {%- endmacro -%}

5
salt/formulas.sls
View File

@ -7,7 +7,7 @@
{% for env, entries in salt['pillar.get']('salt_formulas:list', {}).iteritems() %} {% for env, entries in salt['pillar.get']('salt_formulas:list', {}).iteritems() %}
{% for entry in entries %} {% for entry in entries %}
{% set basedir = formulas_git_opt(env, 'basedir') %} {% set basedir = formulas_git_opt(env, 'basedir')|load_yaml %}
{% set gitdir = '{0}/{1}'.format(basedir, entry) %} {% set gitdir = '{0}/{1}'.format(basedir, entry) %}
{% set update = formulas_git_opt(env, 'update')|load_yaml %} {% set update = formulas_git_opt(env, 'update')|load_yaml %}
@ -26,9 +26,10 @@
{% if gitdir not in processed_gitdirs %} {% if gitdir not in processed_gitdirs %}
{% do processed_gitdirs.append(gitdir) %} {% do processed_gitdirs.append(gitdir) %}
{% set options = formulas_git_opt(env, 'options')|load_yaml %} {% set options = formulas_git_opt(env, 'options')|load_yaml %}
{% set baseurl = formulas_git_opt(env, 'baseurl')|load_yaml %}
{{ gitdir }}: {{ gitdir }}:
git.latest: git.latest:
- name: {{ formulas_git_opt(env, 'baseurl') }}/{{ entry }}.git - name: {{ baseurl }}/{{ entry }}.git
- target: {{ gitdir }} - target: {{ gitdir }}
{%- for key, value in options.iteritems() %} {%- for key, value in options.iteritems() %}
- {{ key }}: {{ value }} - {{ key }}: {{ value }}