X-Git-Url: https://git.arvados.org/arvados-formula.git/blobdiff_plain/abd6fde224cc7c272edfa44266b53eca900f8602..44506de8d5acbdd35b4d1f56c7a1a46085c7c7cf:/arvados/api/package/install.sls diff --git a/arvados/api/package/install.sls b/arvados/api/package/install.sls index 54e20ef..1c487a6 100644 --- a/arvados/api/package/install.sls +++ b/arvados/api/package/install.sls @@ -1,6 +1,10 @@ # -*- coding: utf-8 -*- # vim: ft=sls +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + {#- Get the `tplroot` from `tpldir` #} {%- set tplroot = tpldir.split('/')[0] %} {%- set sls_config_file = tplroot ~ '.config.file' %} @@ -25,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 %} @@ -38,5 +45,6 @@ arvados-api-package-install-pkg-installed: pkg.installed: - name: {{ arvados.api.pkg.name }} - version: {{ arvados.version }} + - refresh: true - require: - sls: {{ sls_config_file }}