Linux-Help/formula-consul
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Defaults are not ignored when pillar is set

Browse source
This commit is contained in:
pierluca 2017-06-14 09:14:45 +02:00 committed by GitHub
parent 8988e95613
commit 1e47bd571f
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
consul/map.jinja
View file

@ -1,5 +1,7 @@
{% import_yaml slspath+"/defaults.yaml" as defaults %} {% import_yaml slspath+"/defaults.yaml" as defaults %}
{% set consul = salt['pillar.get']('consul', default=defaults.consul, merge=True) %}
{## Add any overrides based on CPU architecture. ##} {## Add any overrides based on CPU architecture. ##}
{% set cpu_arch_map = salt['grains.filter_by']({ {% set cpu_arch_map = salt['grains.filter_by']({
'armv6l': { 'armv6l': {
@ -13,10 +15,9 @@
} }
} }
,grain="cpuarch" ,grain="cpuarch"
,merge=salt['pillar.get']('consul')) ,merge=consul)
%} %}
{% do defaults.consul.update(cpu_arch_map) %}
{% set consul = salt['pillar.get']('consul', default=defaults.consul, merge=True) %} {% do consul.update(cpu_arch_map) %}
{% do consul.config.update({'retry_join': consul.config.retry_join or []}) %} {% do consul.config.update({'retry_join': consul.config.retry_join or []}) %}