{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
+{%- set sls_ruby_install = tplroot ~ '.ruby.package.install' %}
{%- from tplroot ~ "/map.jinja" import arvados with context %}
-arvados-shell-package-install-pkg-installed:
- pkg.installed:
- - pkgs: {{ arvados.shell.pkg.name | json }}
+include:
+ - {{ sls_ruby_install }}
-arvados-shell-package-install-ruby-pkg-installed:
+arvados-shell-package-install-pkg-installed:
pkg.installed:
- - name: {{ arvados.ruby.pkg }}
- - only_if: {{ arvados.ruby.manage_ruby }}
+ - pkgs:
+ {%- for package in arvados.shell.pkg.name %}
+ # We use version for our Arvados packages only
+ {%- if package in [
+ 'arvados-client',
+ 'arvados-src',
+ 'libpam-arvados-go',
+ 'python3-arvados-fuse',
+ 'python3-arvados-python-client',
+ 'python3-arvados-cwl-runner',
+ ] %}
+ - {{ package }}: {{ arvados.version }}
+ {%- else %}
+ - {{ package }}
+ {%- endif %}
+ {%- endfor %}
arvados-shell-package-install-gems-deps-pkg-installed:
pkg.installed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
- - only_if: {{ arvados.ruby.manage_gems_deps }}
+ - only_if: test "{{ arvados.ruby.manage_gems_deps | lower }}" = "true"
{% for gm in arvados.shell.gem.name %}
arvados-shell-package-install-gem-{{ gm }}-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 %}
+ {%- endif %}
{% endfor %}