refactor main tags

closes #176
saltyorg · Dec 22, 2023 · 9e5a66f · 9e5a66f
1 parent 42892d4
commit 9e5a66f
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 14 deletions.
diff --git a/roles/main_tags/defaults/main.yml b/roles/main_tags/defaults/main.yml
@@ -0,0 +1,12 @@
+##########################################################################
+# Title:         Saltbox: Saltbox/Mediabox/Feederbox | Default Variables #
+# Author(s):     salty                                                   #
+# URL:           https://github.com/saltyorg/Saltbox                     #
+# --                                                                     #
+##########################################################################
+#                   GNU General Public License v3.0                      #
+##########################################################################
+---
+saltbox_roles: ["media_server", "download_clients", "download_indexers", "tautulli", "overseerr", "portainer", "organizr", "sonarr", "radarr", "lidarr", "iperf3", "nethogs", "glances", "btop"]
+mediabox_roles: ["media_server", "tautulli", "overseerr", "iperf3", "nethogs", "glances", "btop"]
+feederbox_roles: ["download_clients", "download_indexers", "portainer", "organizr", "sonarr", "radarr", "lidarr", "iperf3", "nethogs", "glances", "btop"]
diff --git a/roles/main_tags/tasks/main.yml b/roles/main_tags/tasks/main.yml
@@ -0,0 +1,32 @@
+#########################################################################
+# Title:         Saltbox: Saltbox/Mediabox/Feederbox Role               #
+# Author(s):     salty                                                  #
+# URL:           https://github.com/saltyorg/Saltbox                    #
+# --                                                                    #
+#########################################################################
+#                   GNU General Public License v3.0                     #
+#########################################################################
+---
+- name: "Execute Saltbox roles"
+  ansible.builtin.include_role:
+    name: "{{ saltbox_role }}"
+  with_items: "{{ saltbox_roles }}"
+  loop_control:
+    loop_var: saltbox_role
+  when: ('saltbox' in ansible_run_tags)
+
+- name: "Execute Mediabox roles"
+  ansible.builtin.include_role:
+    name: "{{ mediabox_role }}"
+  with_items: "{{ mediabox_roles }}"
+  loop_control:
+    loop_var: mediabox_role
+  when: ('mediabox' in ansible_run_tags)
+
+- name: "Execute Feederbox roles"
+  ansible.builtin.include_role:
+    name: "{{ feederbox_role }}"
+  with_items: "{{ feederbox_roles }}"
+  loop_control:
+    loop_var: feederbox_role
+  when: ('feederbox' in ansible_run_tags)
diff --git a/saltbox.yml b/saltbox.yml
@@ -35,21 +35,21 @@
     - { role: traefik, tags: ['core', 'saltbox', 'mediabox', 'feederbox', 'traefik', 'traefik-reset-certs'] }
     - { role: cloudflare, tags: ['core', 'saltbox', 'mediabox', 'feederbox', 'cloudflare'], when: ['cloudflare_is_enabled'] }
     # Apps Start
-    - { role: media_server, tags: ['saltbox', 'mediabox', 'media-server'] }
-    - { role: download_clients, tags: ['saltbox', 'feederbox', 'download-clients'] }
-    - { role: download_indexers, tags: ['saltbox', 'feederbox', 'download-indexers'] }
-    - { role: tautulli, tags: ['saltbox', 'mediabox', 'tautulli'] }
-    - { role: overseerr, tags: ['saltbox', 'mediabox', 'overseerr'] }
-    - { role: portainer, tags: ['saltbox', 'feederbox', 'portainer'] }
-    - { role: organizr, tags: ['saltbox', 'feederbox', 'organizr'] }
+    - { role: media_server, tags: ['media-server'] }
+    - { role: download_clients, tags: ['download-clients'] }
+    - { role: download_indexers, tags: ['download-indexers'] }
+    - { role: tautulli, tags: ['tautulli'] }
+    - { role: overseerr, tags: ['overseerr'] }
+    - { role: portainer, tags: ['portainer'] }
+    - { role: organizr, tags: ['organizr'] }
     - { role: cloudplow, tags: ['saltbox', 'feederbox', 'cloudplow', 'cloudplow-reset'], when: ['use_cloudplow'] }
-    - { role: sonarr, tags: ['saltbox', 'feederbox', 'sonarr'] }
-    - { role: radarr, tags: ['saltbox', 'feederbox', 'radarr'] }
-    - { role: lidarr, tags: ['saltbox', 'feederbox', 'lidarr'] }
-    - { role: iperf3, tags: ['saltbox', 'mediabox', 'feederbox', 'iperf3'] }
-    - { role: nethogs, tags: ['saltbox', 'mediabox', 'feederbox', 'nethogs'] }
-    - { role: glances, tags: ['saltbox', 'mediabox', 'feederbox', 'glances'] }
-    - { role: btop, tags: ['saltbox', 'mediabox', 'feederbox', 'btop'] }
+    - { role: sonarr, tags: ['sonarr'] }
+    - { role: radarr, tags: ['radarr'] }
+    - { role: lidarr, tags: ['lidarr'] }
+    - { role: iperf3, tags: ['iperf3'] }
+    - { role: nethogs, tags: ['nethogs'] }
+    - { role: glances, tags: ['glances'] }
+    - { role: btop, tags: ['btop'] }
     - { role: asshama, tags: ['asshama'] }
     - { role: arr_db, tags: ['arr-db'] }
     - { role: authelia, tags: ['authelia', 'authelia-reset', 'lldap-reset'] }