Merge pull request #64 from kurik/RediSearch

fix: Do not load RediSearch on non x86_64 Fedoras
performancecopilot · Jun 20, 2024 · c835b19 · c835b19
2 parents c07d627 + e04f559
commit c835b19
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/roles/redis/tasks/main.yml b/roles/redis/tasks/main.yml
@@ -6,9 +6,13 @@
   loop:
     - "{{ role_path }}/vars/default.yml"
     - "{{ role_path }}/vars/{{ ansible_facts['os_family'] }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_facts['os_family'] }}_{{ ansible_facts['ansible_architecture'] }}.yml"
     - "{{ role_path }}/vars/{{ ansible_facts['distribution'] }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_facts['distribution'] }}_{{ ansible_facts['ansible_architecture'] }}.yml"
     - "{{ role_path }}/vars/{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_major_version'] }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_major_version'] }}_{{ ansible_facts['ansible_architecture'] }}.yml"
     - "{{ role_path }}/vars/{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_version'] }}.yml"
+    - "{{ role_path }}/vars/{{ ansible_facts['distribution'] }}_{{ ansible_facts['distribution_version'] }}_{{ ansible_facts['ansible_architecture'] }}.yml"
   when: item is file
 # yamllint enable rule:line-length
 

diff --git a/roles/redis/vars/Fedora.yml b/roles/redis/vars/Fedora.yml
@@ -2,8 +2,5 @@
 ---
 # Put internal variables here with Fedora specific values.
 
-__redis_packages_extra:
-  - RediSearch
-
-__redis_loaded_modules:
-  - /usr/lib64/redis/modules/redisearch.so
+__redis_packages_extra: []
+__redis_loaded_modules: []
diff --git a/roles/redis/vars/Fedora_x86_64.yml b/roles/redis/vars/Fedora_x86_64.yml
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: MIT
+---
+# Put internal variables here with Fedora on x86_64 specific values.
+
+__redis_packages_extra:
+  - RediSearch
+
+__redis_loaded_modules:
+  - /usr/lib64/redis/modules/redisearch.so