From 4acbf9cea7241f76db3c98eb029b8ea690c17f86 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20B=C3=A9rtoli?= <jbertoli@curii.com>
Date: Wed, 2 Jun 2021 15:38:14 -0300
Subject: [PATCH] 17750: Centos 7 needs rvm for api and workbench
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
---
 arvados/api/package/install.sls       | 3 +++
 arvados/defaults.yaml                 | 2 ++
 arvados/osfamilymap.yaml              | 2 +-
 arvados/workbench/package/install.sls | 3 +++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/arvados/api/package/install.sls b/arvados/api/package/install.sls
index 4070775..ce0004e 100644
--- a/arvados/api/package/install.sls
+++ b/arvados/api/package/install.sls
@@ -29,6 +29,9 @@ arvados-api-package-install-gems-deps-pkg-installed:
 arvados-api-package-install-gem-{{ gm }}-installed:
   gem.installed:
     - name: {{ gm }}
+    {%- if arvados.ruby.use_rvm %}
+    - ruby: {{ arvados.ruby.pkg }}
+    {%- endif %}
     - require:
       - pkg: arvados-api-package-install-gems-deps-pkg-installed
       {%- if arvados.ruby.manage_ruby %}
diff --git a/arvados/defaults.yaml b/arvados/defaults.yaml
index 001840d..ad9a0c5 100644
--- a/arvados/defaults.yaml
+++ b/arvados/defaults.yaml
@@ -16,6 +16,8 @@ arvados:
     manage_ruby: false
     pkg: ruby
     use_rvm: false
+    # Only used if using RVM
+    rvm_gemset: arvados
     manage_gems_deps: false
 
     gems_deps:
diff --git a/arvados/osfamilymap.yaml b/arvados/osfamilymap.yaml
index f4a628c..d40489c 100644
--- a/arvados/osfamilymap.yaml
+++ b/arvados/osfamilymap.yaml
@@ -30,7 +30,7 @@ RedHat:
     manage_ruby: true
     use_rvm: true
 
-    pkg: ruby-2.5.7
+    pkg: ruby-2.5.8
     gems_deps:
       - rubygem-bundler
       - curl
diff --git a/arvados/workbench/package/install.sls b/arvados/workbench/package/install.sls
index f8ce077..f379f64 100644
--- a/arvados/workbench/package/install.sls
+++ b/arvados/workbench/package/install.sls
@@ -30,4 +30,7 @@ arvados-workbench-package-install-pkg-installed:
     - name: {{ arvados.workbench.pkg.name }}
     - version: {{ arvados.version }}
     - require:
+      {%- if arvados.ruby.manage_ruby %}
+      - {{ ruby_dep }}: arvados-ruby-package-install-ruby-{{ ruby_dep }}-installed
+      {%- endif %}
       - sls: {{ sls_config_file }}
-- 
2.30.2