Merge branch '18761-debian-family-apt-keyrings'

[arvados-formula.git] / arvados / workbench / package / install.sls

diff --git a/arvados/workbench/package/install.sls b/arvados/workbench/package/install.sls
index cbda268d967b1a6d1521d74f713b00aed8a8204e..0eb191e51c33376ed0e347262f52ca785460ba14 100644 (file)
--- a/arvados/workbench/package/install.sls
+++ b/arvados/workbench/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' %}
@@ -19,11 +23,15 @@ include:
 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:
     - name: {{ arvados.workbench.pkg.name }}
     - version: {{ arvados.version }}
+    - refresh: true
     - require:
+      {%- if arvados.ruby.manage_ruby %}
+      - {{ ruby_dep }}: arvados-ruby-package-install-ruby-{{ ruby_dep }}-installed
+      {%- endif %}
       - sls: {{ sls_config_file }}