[orangelight] Add sidekiq (#5712)

* Start adding sidekiq to orangelight Co-authored-by: Max Kadel <[email protected]> * [orangelight] Move roles into playbook instead of meta/main.yml - This reduces duplication of running roles when running the playbook, and fixes a bug with the deploy_user role when we run the sidekiq role on a subset of boxes Co-authored-by: Jane Sandberg <[email protected]> --------- Co-authored-by: Jane Sandberg <[email protected]> Co-authored-by: Max Kadel <[email protected]> Co-authored-by: Jane Sandberg <[email protected]>
pulibrary · Jan 9, 2025 · a43d16b · a43d16b
1 parent 9be07d8
commit a43d16b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 10 deletions.
diff --git a/group_vars/orangelight/common.yml b/group_vars/orangelight/common.yml
@@ -125,3 +125,4 @@ rails_app_vars:
     value: "{{ vault_ol_libanswers_client_secret }}"
 sneakers_worker_name: orangelight-sneakers
 sneakers_workers: EventHandler
+sidekiq_worker_name: sidekiq
diff --git a/playbooks/orangelight.yml b/playbooks/orangelight.yml
@@ -12,10 +12,21 @@
     - ../group_vars/orangelight/{{ runtime_env | default('staging') }}_solr.yml
     - ../group_vars/orangelight/vault.yml
   roles:
+    - role: deploy_user
+    - role: bind9
+    - role: ruby_s
+    - role: passenger
+    - role: postgresql
+    - role: nodejs
+    - role: sidekiq_worker
+      when: "'indexer' in inventory_hostname"
+    - role: rails_app
+    - role: sneakers_worker
+    - role: redis
+    - role: extra_path
     - role: mailcatcher
-    - role: roles/postgresql
-    - role: roles/orangelight
-    - role: roles/datadog
+    - role: orangelight
+    - role: datadog
       when: runtime_env | default('staging') == "production"
 
   post_tasks:

diff --git a/roles/deploy_user/tasks/main.yml b/roles/deploy_user/tasks/main.yml
@@ -22,6 +22,7 @@
   run_once: true
   tags: update_keys
 
+
 - name: deploy_user | create the .ssh directory
   ansible.builtin.file:
     path: "/home/{{ deploy_user }}/.ssh/"

diff --git a/roles/orangelight/meta/main.yml b/roles/orangelight/meta/main.yml
@@ -7,14 +7,9 @@ galaxy_info:
 
   license: MIT
 
-  min_ansible_version: 2.2
+  min_ansible_version: '2.2'
 
   platforms:
     - name: Ubuntu
       versions:
-        - 18.04
-dependencies:
-  - role: 'redis'
-  - role: 'sneakers_worker'
-  - role: 'extra_path'
-  - role: 'rails_app'
+        - jammy
diff --git a/roles/orangelight/molecule/default/converge.yml b/roles/orangelight/molecule/default/converge.yml
@@ -9,6 +9,17 @@
       apt:
         update_cache: true
         cache_valid_time: 600
+  roles:
+    - role: deploy_user
+    - role: bind9
+    - role: ruby_s
+    - role: passenger
+    - role: postgresql
+    - role: nodejs
+    - role: rails_app
+    - role: sneakers_worker
+    - role: redis
+    - role: extra_path
   tasks:
     - name: "Include orangelight"
       include_role: