17750: Centos 7 needs rvm for api and workbench

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>

diff --git a/arvados/api/package/install.sls b/arvados/api/package/install.sls
index 4070775c373f871d045e3533a39a1faca0e10e41..ce0004e676807d68a68e9ff5c182befb90e48176 100644 (file)
--- 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 001840d2783d9732ffb1cd304f368dff4c0f6943..ad9a0c51087ff29384aa631d018eabe4a8a7ac16 100644 (file)
--- 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 f4a628ce1c5812c8616304d673739bfe634ccc91..d40489cb7de163b3b92f1a217e3718873c19c964 100644 (file)
--- 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 f8ce0771955e6e1ddc9bd04fed01f5a30c1ca9dd..f379f649683fb174fa176b855c8d5c3cb1f339ae 100644 (file)
--- 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 }}