From bae3d3114c417dbf65158e33c8ddc7df62d66e52 Mon Sep 17 00:00:00 2001
From: Guillaume Coré <guillaume.core@gmail.com>
Date: Wed, 15 Jan 2020 14:33:49 +0100
Subject: [PATCH] Introduce default_vars.yml (#991)
---
ansible/include_vars.yml | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/ansible/include_vars.yml b/ansible/include_vars.yml
index 18a8412..9cd8a18 100644
--- a/ansible/include_vars.yml
+++ b/ansible/include_vars.yml
@@ -11,23 +11,45 @@
output_dir: "{{ hostvars.localhost.output_dir }}"
when: hostvars.localhost.output_dir is defined
- - name: stats env_vars.yml and (legacy) env_secret_vars.yml
+ - name: Stat default variables files (both yaml/yml extensions)
+ vars:
+ find_me:
+ # Global default vars related to the cloud provider
+ - cloud_providers/{{ cloud_provider }}_default_vars
+ # Legacy env_vars.yml (replaced by default_vars.yml)
+ - configs/{{ env_type }}/env_vars
+ # Default vars of the config
+ - configs/{{ env_type }}/default_vars
+ # Default vars of the config, specific to a cloud provider
+ - configs/{{ env_type }}/default_vars.{{ cloud_provider }}
+ - configs/{{ env_type }}/default_vars_{{ cloud_provider }}
+ # Lecacy secret vars file.
+ - configs/{{ env_type }}/env_secret_vars
+ extensions:
+ - yaml
+ - yml
stat:
- path: "{{ item }}"
- loop:
- - cloud_providers/{{ cloud_provider }}_default_vars.yml
- - configs/{{ env_type }}/env_vars.yml
- - configs/{{ env_type }}/env_secret_vars.yml
- - "{{ secret_file | d('/secret/file/not/passed') }}"
+ path: "{{ item[0] ~ '.' ~ item[1] }}"
+ loop: "{{ find_me | product(extensions) | list }}"
register: rstat_varfiles
- - name: Include vars files
+ - name: Stat variables files
+ vars:
+ find_me:
+ # secret file path passed as extra-var
+ - "{{ secret_file | d('/secret/file/not/passed') }}"
+ stat:
+ path: "{{ item }}"
+ loop: "{{ find_me }}"
+ register: rstat2_varfiles
+
+ - name: Include variables files
include_vars:
file: "{{ item.stat.path }}"
when:
- item is not skipped
- item.stat.exists
- loop: "{{ rstat_varfiles.results }}"
+ loop: "{{ rstat_varfiles.results + rstat2_varfiles.results }}"
loop_control:
label: >-
{{ (
--
Gitblit v1.9.3