X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/4bf9501a14f86845865244ee3ffb03a34707d36c..abd6fde224cc7c272edfa44266b53eca900f8602:/arvados/shell/package/install.sls

diff --git a/arvados/shell/package/install.sls b/arvados/shell/package/install.sls
index d2de401..6d1300f 100644
--- a/arvados/shell/package/install.sls
+++ b/arvados/shell/package/install.sls
@@ -6,6 +6,10 @@
 {%- set sls_ruby_install = tplroot ~ '.ruby.package.install' %}
 {%- from tplroot ~ "/map.jinja" import arvados with context %}
 
+{%- if arvados.ruby.manage_ruby %}
+  {%- set ruby_dep = 'rvm' if arvados.ruby.use_rvm else 'pkg' %}
+{%- endif %}
+
 include:
   - {{ sls_ruby_install }}
 
@@ -17,7 +21,6 @@ arvados-shell-package-install-pkg-installed:
         {%- if package in [
           'arvados-client',
           'arvados-src',
-          'libpam-arvados-go',
           'python3-arvados-fuse',
           'python3-arvados-python-client',
           'python3-arvados-cwl-runner',
@@ -31,22 +34,15 @@ arvados-shell-package-install-pkg-installed:
 arvados-shell-package-install-gems-deps-pkg-installed:
   pkg.installed:
     - pkgs: {{ arvados.ruby.gems_deps | json }}
-    - only_if: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
+    - onlyif: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
 
-{% for gm in arvados.shell.gem.name %}
+{%- for gm in arvados.shell.gem.name %}
 arvados-shell-package-install-gem-{{ gm }}-installed:
   gem.installed:
     - name: {{ gm }}
     - require:
-      - pkg: arvados-shell-package-install-gems-deps-pkg-installed
       {%- if arvados.ruby.manage_ruby %}
-        {%- if salt['grains.get']('osfinger') != 'CentOS Linux-7' %}
-      - pkg: arvados-ruby-package-install-ruby-pkg-installed
-        {%- else %}
-      # - rvm: arvados-ruby-package-install-ruby-gemset-present
-      - rvm: arvados-ruby-package-install-ruby-rvm-installed
-      # - rvm: gemset_present
-    # - ruby: ruby-2.5.7@arvados
-        {%- endif %}
+      - {{ ruby_dep }}: arvados-ruby-package-install-ruby-{{ ruby_dep }}-installed
       {%- endif %}
-{% endfor %}
+      - pkg: arvados-shell-package-install-gems-deps-pkg-installed
+{%- endfor %}