{%- 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 }}
{%- if package in [
'arvados-client',
'arvados-src',
- 'libpam-arvados-go',
'python3-arvados-fuse',
'python3-arvados-python-client',
'python3-arvados-cwl-runner',
- {{ package }}
{%- endif %}
{%- endfor %}
+ - refresh: true
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 %}