Merge branch 'release-1.8' into rc-1.8.11

UtrechtUniversity · Oct 11, 2023 · 29e32d1 · 29e32d1
2 parents 463e8d0 + f3691b6
commit 29e32d1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/docs/administration/configuring-yoda.md b/docs/administration/configuring-yoda.md
@@ -137,7 +137,8 @@ Note: if one of these variables are different for a host then define them in the
 Variable   | Description
 -----------|---------------------------------------------
 instance                     | Name of Yoda instance, as defined in hosts file
-yoda_version                 | Git branch, for example: development or release-0.9.7
+yoda_version                 | Yoda version. Use a git branch (e.g. release-1.8) or a tag (e.g. v1.8.5)
+yoda_ruleset_version         | Version of the main Yoda ruleset to use. Defaults to the value of `yoda_version`.
 yoda_environment             | Yoda environment: development, testing, acceptance or production
 yoda_portal_fqdn             | Yoda Portal fully qualified domain name (FQDN)
 yoda_davrods_fqdn            | Yoda Davrods WebDAV fully qualified domain name (FQDN)

diff --git a/roles/yoda_rulesets/defaults/main.yml b/roles/yoda_rulesets/defaults/main.yml
@@ -6,11 +6,12 @@ irods_service_account: irods
 credentials_store: /var/lib/irods/.credentials_store
 
 # Ruleset configuration.
+yoda_ruleset_version: "{{ yoda_version }}"
 core_rulesets:
   - name: yoda-ruleset
     repo: https://github.com/UtrechtUniversity/yoda-ruleset.git
     ruleset_name: rules-uu
-    version: "{{ yoda_version }}"
+    version: "{{ yoda_ruleset_version }}"
     install_scripts: true
   - name: core
     ruleset_name: core

diff --git a/roles/yoda_rulesets/tasks/yoda-ruleset.yml b/roles/yoda_rulesets/tasks/yoda-ruleset.yml
@@ -124,7 +124,7 @@
   ansible.builtin.file:
     path: "/var/lib/irods/msiExecCmd_bin/{{ item }}"
     state: absent
-  when: not ansible_check_mode and enable_open_search
+  when: not ansible_check_mode
   with_items:
     - enable-indexing.sh
     - disable-indexing.sh