Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(map): avoid defaults.merge bug on salt-ssh #77

Merged
merged 1 commit into from
Mar 8, 2019
Merged

fix(map): avoid defaults.merge bug on salt-ssh #77

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions redis/map.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
# -*- coding: utf-8 -*-
# vim: ft=jinja

{% import_yaml 'redis/defaults.yaml' as defaults %}
{% import_yaml 'redis/osfamilymap.yaml' as osfamilymap %}
{% import_yaml 'redis/osfingermap.yaml' as osfingermap %}
{#- Start imports as #}
{%- import_yaml 'redis/defaults.yaml' as default_settings %}
{%- import_yaml 'redis/osfamilymap.yaml' as osfamilymap %}
{%- import_yaml 'redis/osfingermap.yaml' as osfingermap %}

{# merge the osfamilymap #}
{% set osfamily = salt['grains.filter_by'](osfamilymap, grain='os_family') or{} %}
{% do salt['defaults.merge'](defaults['redis'], osfamily) %}
{%- set defaults = salt['grains.filter_by'](default_settings,
default='redis',
merge=salt['grains.filter_by'](osfamilymap, grain='os_family',
merge=salt['grains.filter_by'](osfingermap, grain='osfinger',
merge=salt['pillar.get']('redis:lookup', default={})
)
)
) %}

{# merge the osfingermap #}
{% set osfinger = salt['grains.filter_by'](osfingermap, grain='osfinger') or {} %}
{% do salt['defaults.merge'](defaults['redis'], osfinger) %}

{# merge the lookup #}
{% set lookup = salt['pillar.get']('redis:lookup', default={}, merge=True) %}
{% do salt['defaults.merge'](defaults['redis'], lookup) %}

{# merge all #}
{% set redis_settings = salt['pillar.get']('redis', default=defaults['redis'], merge=True) %}
{#- Merge the redis pillar #}
{%- set redis = salt['pillar.get']('redis', default=defaults, merge=True) %}