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

Merge pull request #19 from pierluca/patch-2

Browse source 
Bugfix: Defaults are ignored when pillar is set
This commit is contained in:
Javier Bértoli 2017-06-23 07:33:37 -03:00 committed by GitHub
commit a30276a1dc
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
consul/map.jinja
View file

@ -1,7 +1,9 @@
{% 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 consul = salt['grains.filter_by']({
'armv6l': { 'armv6l': {
"arch": 'arm' "arch": 'arm'
}, },
@ -13,10 +15,7 @@
} }
} }
,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.config.update({'retry_join': consul.config.retry_join or []}) %} {% do consul.config.update({'retry_join': consul.config.retry_join or []}) %}