Merge pull request #197 from noelmcloughlin/notOSmap
Rename osmap to osfamilymap
This commit is contained in:
@@ -1,11 +1,11 @@
|
|||||||
{% import_yaml "postgres/defaults.yaml" as defaults %}
|
{% import_yaml "postgres/defaults.yaml" as defaults %}
|
||||||
{% import_yaml "postgres/osmap.yaml" as osmap %}
|
{% import_yaml "postgres/osfamilymap.yaml" as osfamilymap %}
|
||||||
{% import_yaml "postgres/codenamemap.yaml" as oscodenamemap %}
|
{% import_yaml "postgres/codenamemap.yaml" as oscodenamemap %}
|
||||||
|
|
||||||
{% set postgres = salt['grains.filter_by'](
|
{% set postgres = salt['grains.filter_by'](
|
||||||
defaults,
|
defaults,
|
||||||
merge=salt['grains.filter_by'](
|
merge=salt['grains.filter_by'](
|
||||||
osmap,
|
osfamilymap,
|
||||||
grain='os_family',
|
grain='os_family',
|
||||||
merge=salt['grains.filter_by'](
|
merge=salt['grains.filter_by'](
|
||||||
oscodenamemap,
|
oscodenamemap,
|
||||||
|
|||||||
Reference in New Issue
Block a user