X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/33fe961e844d1e747cbd970ed1bf97ab88a7fa89..ac04766d27fbfb2473cfdca28258184c161504b2:/arvados/map.jinja diff --git a/arvados/map.jinja b/arvados/map.jinja index 7ef4b33..3b583f8 100644 --- a/arvados/map.jinja +++ b/arvados/map.jinja @@ -1,11 +1,15 @@ # -*- coding: utf-8 -*- # vim: ft=jinja +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 {#- Get the `tplroot` from `tpldir` #} {%- set tplroot = tpldir.split('/')[0] %} {#- Start imports as #} {%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %} {%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %} +{%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %} {#- Retrieve the config dict only once #} {%- set _config = salt['config.get'](tplroot, default={}) %} @@ -17,8 +21,12 @@ osfamilymap, grain='os_family', merge=salt['grains.filter_by']( - _config, - default='lookup' + osfingermap, + grain='osfinger', + merge=salt['grains.filter_by']( + _config, + default='lookup' + ) ) ) )