Further app load optiomation due to 2.18->2.20 update

roles/sys-svc-docker/tasks/01_core.yml

@@ -13,8 +13,9 @@
 
 - name: Setup Swapfile to prevent OOM Failures
   # @ See https://en.wikipedia.org/wiki/Out_of_memory
-  include_role:
-    name: "svc-opt-swapfile"
+  include_tasks: "utils/load_app.yml"
+  vars:
+    load_app_id: "svc-opt-swapfile"
   when: run_once_svc_opt_swapfile is not defined
 
 - name: "Load reset tasks when MODE_RESET is enabled"

roles/sys-svc-webserver-core/tasks/01_core.yml

@@ -31,14 +31,9 @@
   notify: restart openresty
 
 - name: Include OpenResty (Once)
-  # Outside of run_once block is necessary for handler loading
-  # Otherwise the when: condition from the block is added to the handlers
-  # Inside openresty their is a validation that it doesn't run multiple times
-  include_role:
-    name: svc-prx-openresty
-    # Explicit set to guaranty that application_id will not be overwritten.
-    # Should be anyhow the default case
-    public: false
+  include_tasks: "utils/load_app.yml"
+  vars:
+    load_app_id: svc-prx-openresty
   when: run_once_svc_prx_openresty is not defined
 
 - name: Include health dependencies

roles/web-app-bluesky/tasks/main.yml

@@ -48,7 +48,7 @@
       }}
 
 - name: "Redirect deactivated BlueSky Services to {{ BLUESKY_API_DOMAIN }}"
-  include_role:
-    name: web-opt-rdr-domains
+  include_tasks: "utils/load_app.yml"
   vars:
+    load_app_id: web-opt-rdr-domains
     redirect_domain_mappings: "{{ BLUESKY_REDIRECT_DOMAIN_MAPPINGS }}"

roles/web-app-desktop/tasks/03_javascript.yml

@@ -1,7 +1,7 @@
 - name: "load required 'web-svc-cdn' for {{ application_id }}"
-  include_role:
-    name: web-svc-cdn
-    public: false
+  include_tasks: "utils/load_app.yml"
+  vars:
+    load_app_id: web-svc-cdn
   when: run_once_web_svc_cdn is not defined
 
 - name: Ensure {{ DESKTOP_JS_SERVER_DIR }} exists

roles/web-app-flowise/tasks/main.yml

@@ -1,7 +1,8 @@
 ---
 - name: "Install Ollama Dependency"
-  include_role:
-    name: svc-ai-ollama
+  include_tasks: "utils/load_app.yml"
+  vars:
+    load_app_id: svc-ai-ollama
   when:    
     - run_once_svc_ai_ollama is not defined
     - OLLAMA_LOCAL_ENABLED | bool

roles/web-app-keycloak/tasks/04_dependencies.yml

@@ -1,8 +1,8 @@
 - block:
   - name: "load required 'web-svc-logout' for {{ application_id }}"
-    include_role:
-      name: web-svc-logout
-      public: false
+    include_tasks: "utils/load_app.yml"
+    vars:
+      load_app_id: web-svc-logout
     when: run_once_web_svc_logout is not defined
   
   - name: "load docker, db and proxy for {{ application_id }}"

roles/web-app-openwebui/tasks/main.yml

@@ -1,7 +1,8 @@
 ---
 - name: "Install Ollama Dependency"
-  include_role:
-    name: svc-ai-ollama
+  include_tasks: "utils/load_app.yml"
+  vars:
+    load_app_id: svc-ai-ollama
   when:    
     - run_once_svc_ai_ollama is not defined
     - OLLAMA_LOCAL_ENABLED | bool

roles/web-opt-rdr-www/tasks/main.yml

@@ -1,7 +1,7 @@
 - name: Include web-opt-rdr-domains role for www-to-bare redirects
-  include_role:
-    name: web-opt-rdr-domains
+  include_tasks: "utils/load_app.yml"
   vars:
+    load_app_id: web-opt-rdr-domains
     redirect_domain_mappings: "{{ REDIRECT_WWW_DOMAINS | map('regex_replace', '^www\\.(.+)$', '{ source: \"www.\\1\", target: \"\\1\" }') | map('from_yaml') | list }}"
   when: REDIRECT_WWW_FLAVOR == 'origin'