Adapt to more scoped config

plays/commonlib/vars.yml

@@ -1,4 +1,8 @@
 ---
+# Note(decentral1se): please note that the majority of the vars that are
+# referenced in this play are passed in via --extra-vars definitions in the
+# functions script
+
 - name: Check if internal system variables exists
   stat:
     path: "{{ plugin_config_root }}/vars.yml"
@@ -12,9 +16,13 @@
 
 - name: Export internal deployment variables
   set_fact:
-    dokku_mariadb_db_addr: "dokku-mariadb-{{ app }}"
-    dokku_mariadb_db_user: "mariadb"
-    dokku_hostname: "{{ lookup('file', '/home/dokku/HOSTNAME') }}"
+    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:
@@ -26,6 +34,7 @@
   when: config_yml.stat.exists
   include_vars:
     file: "{{ app_config_root }}/config.yml"
+    name: "config"
 
 - name: Check if an application vault directory exists
   stat:
@@ -38,5 +47,6 @@
   include_vars:
     ignore_unknown_extensions: true
     dir: "{{ app_config_root }}/vault"
+    name: "vault"
     extensions:
       - yml