Move to dictionary vars strategy

plays/commonlib/vars.yml

@@ -14,16 +14,6 @@
   include_vars:
     file: "{{ plugin_config_root }}/vars.yml"
 
-- name: Export internal deployment variables
-  set_fact:
-    dokku:
-      {
-        app: "{{ app }}",
-        mariadb_addr: "dokku-mariadb-{{ app }}",
-        mariadb_user: "mariadb",
-        hostname: "{{ lookup('file', '/home/dokku/HOSTNAME') }}",
-      }
-
 - name: Check if the application config file exists
   stat:
     path: "{{ app_config_root }}/config.yml"
@@ -35,10 +25,6 @@
   include_vars:
     file: "{{ app_config_root }}/config.yml"
 
-- name: CONFIG DEBUG
-  debug:
-    msg: "{{ vars }}"
-
 - name: Check if an application vault directory exists
   stat:
     path: "{{ app_config_root }}/vault"
@@ -50,11 +36,25 @@
   include_vars:
     ignore_unknown_extensions: true
     dir: "{{ app_config_root }}/vault"
-    name: "vault"
     extensions:
       - yml
   register: vault_include
 
-- name: Load vault variables into vault dictionary
+- name: Create the variable dictionaries
   set_fact:
-    vault: "{{ vault_include.ansible_facts.vault }}"
+    config:
+      {
+        "vars": "{{ lookup('vars', 'vars.vars', default=[]) }}",
+        "db": "{{ lookup('vars', 'vars.db', default=[]) }}",
+        "env": "{{ lookup('vars', 'vars.env', default=[]) }}",
+        "volumes": "{{ lookup('vars', 'vars.volumes', default=[]) }}",
+        "templates": "{{ lookup('vars', 'vars.templates', default=[]) }}",
+        "vault": "{{ vault_include.ansible_facts.vault }}",
+      }
+    dokku:
+      {
+        app: "{{ app }}",
+        mariadb_addr: "dokku-mariadb-{{ app }}",
+        mariadb_user: "mariadb",
+        hostname: "{{ lookup('file', '/home/dokku/HOSTNAME') }}",
+      }