Ensure options for formulas git.latest are also based on defaults

myii · Jul 1, 2016 · c00faca · c00faca
1 parent 5f03ce9
commit c00faca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/salt/formulas.jinja b/salt/formulas.jinja
@@ -14,6 +14,13 @@
 {{ value|yaml }}
 {%- endmacro -%}
 
+{%- macro formulas_opts_for_git_latest(env) -%}
+{%- set options = defaults['options'] or {} -%}
+{%- do options.update(salt['pillar.get']('salt_formulas:git_opts:default:options') or {}) -%}
+{%- do options.update(salt['pillar.get']('salt_formulas:git_opts:{0}:options'.format(env)) or {}) -%}
+{{ options|yaml }}
+{%- endmacro -%}
+
 {%- macro formulas_roots(env) -%}
 {%- set value = [] -%}
 {%- for dir in formulas.get(env, []) -%}

diff --git a/salt/formulas.sls b/salt/formulas.sls
@@ -2,6 +2,7 @@
 {% set processed_basedirs = [] %}
 
 {% from "salt/formulas.jinja" import formulas_git_opt with context %}
+{% from "salt/formulas.jinja" import formulas_opts_for_git_latest with context %}
 
 # Loop over all formulas listed in pillar data
 {% for env, entries in salt['pillar.get']('salt_formulas:list', {}).items() %}
@@ -25,7 +26,7 @@
 # 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 options = formulas_opts_for_git_latest(env)|load_yaml %}
 {% set baseurl = formulas_git_opt(env, 'baseurl')|load_yaml %}
 {{ gitdir }}:
   git.latest: