fix(repo): distro/release are not always the same

[arvados-formula.git] / arvados / map.jinja

diff --git a/arvados/map.jinja b/arvados/map.jinja
index 1479309e9fea686cc98e7a8d15d0062824504419..7ef4b339ad87ae159650e070f58bdc0c40d3c2d8 100644 (file)
--- a/arvados/map.jinja
+++ b/arvados/map.jinja
@@ -5,10 +5,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {#- Start imports as #}
 {%- import_yaml tplroot ~ "/defaults.yaml" as default_settings %}
-{%- import_yaml tplroot ~ "/osarchmap.yaml" as osarchmap %}
 {%- import_yaml tplroot ~ "/osfamilymap.yaml" as osfamilymap %}
-{%- import_yaml tplroot ~ "/osmap.yaml" as osmap %}
-{%- import_yaml tplroot ~ "/osfingermap.yaml" as osfingermap %}
 
 {#- Retrieve the config dict only once #}
 {%- set _config = salt['config.get'](tplroot, default={}) %}
@@ -17,23 +14,11 @@
       default_settings,
       default=tplroot,
       merge=salt['grains.filter_by'](
-        osarchmap,
-        grain='osarch',
+        osfamilymap,
+        grain='os_family',
         merge=salt['grains.filter_by'](
-          osfamilymap,
-          grain='os_family',
-          merge=salt['grains.filter_by'](
-            osmap,
-            grain='os',
-            merge=salt['grains.filter_by'](
-              osfingermap,
-              grain='osfinger',
-              merge=salt['grains.filter_by'](
-                _config,
-                default='lookup'
-              )
-            )
-          )
+          _config,
+          default='lookup'
         )
       )
     )
@@ -46,11 +31,4 @@
     )
 %}
 
-{#- Change **arvados** to match with your formula's name and then remove this line #}
 {%- set arvados = config %}
-
-{#- Post-processing for specific non-YAML customisations #}
-{%- if grains.os == 'MacOS' %}
-{%-   set macos_group = salt['cmd.run']("stat -f '%Sg' /dev/console") %}
-{%-   do arvados.update({'rootgroup': macos_group}) %}
-{%- endif %}