From 8b7e6a30f882a3b411a3dd22cdc3be795bb3c2c4 Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 13 Apr 2020 20:21:07 +0200 Subject: [PATCH] Push internal loading back to prepare step --- plays/lib/prepare.yml | 11 +++++++++++ plays/lib/vars.yml | 11 ----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plays/lib/prepare.yml b/plays/lib/prepare.yml index 97f55ef..9d1913f 100644 --- a/plays/lib/prepare.yml +++ b/plays/lib/prepare.yml @@ -1,4 +1,15 @@ --- +- name: Check if internal system variables exists + stat: + path: "{{ plugin_config_root }}/vars.yml" + register: vars_yml + +- name: Load internal system variables + no_log: true + when: vars_yml.stat.exists + include_vars: + file: "{{ plugin_config_root }}/vars.yml" + - name: Export internal variable placeholders set_fact: dokku_mariadb_db_addr: "dokku-mariadb-{{ app }}" diff --git a/plays/lib/vars.yml b/plays/lib/vars.yml index 5de6896..2c83af8 100644 --- a/plays/lib/vars.yml +++ b/plays/lib/vars.yml @@ -1,15 +1,4 @@ --- -- name: Check if internal system variables exists - stat: - path: "{{ plugin_config_root }}/vars.yml" - register: vars_yml - -- name: Load internal system variables - no_log: true - when: vars_yml.stat.exists - include_vars: - file: "{{ plugin_config_root }}/vars.yml" - - name: Check if the app config file exists stat: path: "{{ app_config_root }}/config.yml"