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

Applied review comments

Browse source
This commit is contained in:
pierluca 2017-06-19 09:15:05 +02:00 committed by GitHub
parent 1e47bd571f
commit 31cd1b5137
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
consul/map.jinja
View file

@ -3,7 +3,7 @@
{% set consul = salt['pillar.get']('consul', default=defaults.consul, merge=True) %} {% 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'
}, },
@ -18,6 +18,4 @@
,merge=consul) ,merge=consul)
%} %}
{% 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 []}) %}