From 995f06d055387a31a6ce3a094d21cbbdcc846ff5 Mon Sep 17 00:00:00 2001
From: Luke Murphy <lukewm@riseup.net>
Date: Tue, 14 Apr 2020 14:30:50 +0200
Subject: [PATCH] Use named inclusion

---
 plays/commonlib/vars.yml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/plays/commonlib/vars.yml b/plays/commonlib/vars.yml
index 46f5958..b60943f 100644
--- a/plays/commonlib/vars.yml
+++ b/plays/commonlib/vars.yml
@@ -24,6 +24,7 @@
   when: config_yml.stat.exists
   include_vars:
     file: "{{ app_config_root }}/config.yml"
+    name: "config"
   register: config_include
 
 - name: Check if an application vault directory exists
@@ -37,6 +38,7 @@
   include_vars:
     ignore_unknown_extensions: true
     dir: "{{ app_config_root }}/vault"
+    name: "vault"
     extensions:
       - yml
   register: vault_include
@@ -53,17 +55,17 @@
 
 - name: Create the vault variable dictionary
   set_fact:
-    vault: "{{ vault_include.ansible_facts }}"
+    vault: "{{ vault_include.ansible_facts.vault }}"
 
 - name: Create the config variable dictionary
   set_fact:
     config:
       {
-        "vars": "{{ config_include.ansible_facts.vars | default([]) }}",
-        "db": "{{ config_include.ansible_facts.db | default([]) }}",
-        "env": "{{ config_include.ansible_facts.env | default([]) }}",
-        "volumes": "{{ config_include.ansible_facts.volumes | default([]) }}",
-        "templates": "{{ config_include.ansible_facts.templates | default([]) }}",
+        "vars": "{{ config_include.ansible_facts.config.vars | default([]) }}",
+        "db": "{{ config_include.ansible_facts.config.db | default([]) }}",
+        "env": "{{ config_include.ansible_facts.config.env | default([]) }}",
+        "volumes": "{{ config_include.ansible_facts.config.volumes | default([]) }}",
+        "templates": "{{ config_include.ansible_facts.config.templates | default([]) }}",
       }
 
 - name: Debug variable dictionaries
@@ -72,5 +74,4 @@
   with_items:
     - "{{ config }}"
     - "{{ dokku }}"
-    - "{{ vars }}"
   when: debug is defined and debug == true