Merge branch '18631-shell-login-sync'

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

diff --git a/arvados/map.jinja b/arvados/map.jinja
index 1479309e9fea686cc98e7a8d15d0062824504419..3b583f81c7912cd597449f1df1fe7e530a046fbd 100644 (file)
--- a/arvados/map.jinja
+++ b/arvados/map.jinja
@@ -1,13 +1,14 @@
 # -*- 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 ~ "/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 #}
@@ -17,22 +18,14 @@
       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',
+          osfingermap,
+          grain='osfinger',
           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 +39,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 %}