projects
/
arvados-formula.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix(conditionals): wrong onlyif specification
[arvados-formula.git]
/
arvados
/
workbench
/
package
/
install.sls
diff --git
a/arvados/workbench/package/install.sls
b/arvados/workbench/package/install.sls
index 7487a6033a491a5d98551a94781bdcab522ad75b..dff47f62b15b0fd61d7d99396a57f4acbce98705 100644
(file)
--- a/
arvados/workbench/package/install.sls
+++ b/
arvados/workbench/package/install.sls
@@
-4,21
+4,22
@@
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_config_file = tplroot ~ '.config.file' %}
{#- Get the `tplroot` from `tpldir` #}
{%- set tplroot = tpldir.split('/')[0] %}
{%- set sls_config_file = tplroot ~ '.config.file' %}
+{%- set sls_ruby_install = tplroot ~ '.ruby.package.install' %}
{%- from tplroot ~ "/map.jinja" import arvados with context %}
{%- from tplroot ~ "/map.jinja" import arvados with context %}
-# The workbench server requires a valid config BEFORE installing...
+{%- if arvados.ruby.manage_ruby %}
+ {%- set ruby_dep = 'rvm' if arvados.ruby.use_rvm else 'pkg' %}
+{%- endif %}
+
include:
include:
+ # The workbench server requires a valid config BEFORE installing...
- {{ sls_config_file }}
- {{ sls_config_file }}
-
-arvados-workbench-package-install-ruby-pkg-installed:
- pkg.installed:
- - name: {{ arvados.ruby.pkg }}
- - only_if: test "{{ arvados.ruby.manage_ruby | lower }}" = "true"
+ - {{ sls_ruby_install }}
arvados-workbench-package-install-gems-deps-pkg-installed:
pkg.installed:
- pkgs: {{ arvados.ruby.gems_deps | json }}
arvados-workbench-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"
arvados-workbench-package-install-pkg-installed:
pkg.installed:
arvados-workbench-package-install-pkg-installed:
pkg.installed: