[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]>

playbooks/orangelight.yml

@@ -12,12 +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:

roles/deploy_user/tasks/main.yml

@@ -22,13 +22,6 @@
   run_once: true
   tags: update_keys
 
-- name: DEBUG DON'T COMMIT ME - inventory
-  ansible.builtin.debug:
-    var: hostvars[inventory_hostname]
-
-- name: DEBUG DON'T COMMIT ME - keys
-  ansible.builtin.debug:
-    var: deploy_user_keys_from_github
 
 - name: deploy_user | create the .ssh directory
   ansible.builtin.file:

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

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: