Skip to content

Commit

Permalink
Merge pull request #14 from noelmcloughlin/get
Browse files Browse the repository at this point in the history
refactor(map.jinja): use config.get
  • Loading branch information
aboe76 authored Sep 21, 2019
2 parents 2bf713f + ac7e001 commit c91731e
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lvm/map.jinja
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
defaults,
merge=salt['grains.filter_by'](
osfamilymap,
merge=salt['pillar.get']('lvm', {}),
merge=salt['config.get']('lvm', {}),
),
base='lvm',
) %}
Expand All @@ -16,5 +16,5 @@
{% set os_family_map = salt['grains.filter_by']({
'RedHat': { 'pkg': 'lvm2', },
'Debian': { 'pkg': 'lvm2', },
}, merge=salt['pillar.get']('lvm:lookup')) %}
{% set lvm_settings = salt['pillar.get']( 'lvm', default=os_family_map, merge=True) %}
}, merge=salt['config.get']('lvm:lookup')) %}
{% set lvm_settings = salt['config.get']( 'lvm', default=os_family_map, merge=True) %}

0 comments on commit c91731e

Please sign in to comment.