Fixed settings merging in map.jinja
This commit is contained in:
parent
efe90e29f0
commit
646d0b079c
@ -24,6 +24,6 @@ that differ from whats in defaults.yaml
|
|||||||
{## Merge in changes from the system pillar ##}
|
{## Merge in changes from the system pillar ##}
|
||||||
{% set system_settings = salt['pillar.get'](
|
{% set system_settings = salt['pillar.get'](
|
||||||
'system',
|
'system',
|
||||||
default=default_settings.nsswitch,
|
default=default_settings,
|
||||||
merge=True
|
merge=True
|
||||||
) %}
|
) %}
|
||||||
|
Loading…
Reference in New Issue
Block a user