From ac04766d27fbfb2473cfdca28258184c161504b2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20B=C3=A9rtoli?= <jbertoli@curii.com>
Date: Sun, 8 Aug 2021 16:35:48 -0300
Subject: [PATCH] Add fingermap for Ubuntu-18.04
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

refs #17990
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
---
 arvados/map.jinja        | 12 ++++++++++--
 arvados/osfingermap.yaml | 10 ++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 arvados/osfingermap.yaml

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'
+          )
         )
       )
     )
diff --git a/arvados/osfingermap.yaml b/arvados/osfingermap.yaml
new file mode 100644
index 0000000..dd1b56d
--- /dev/null
+++ b/arvados/osfingermap.yaml
@@ -0,0 +1,10 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+---
+Ubuntu-18.04:
+  ruby:
+    manage_ruby: true
+    use_rvm: true
+
+    pkg: ruby-2.7.2
-- 
2.30.2