From 959ad51d4c1f9f8c88ace7bf31d4738c2d8ff0ac Mon Sep 17 00:00:00 2001 From: David Galloway Date: Sun, 22 Mar 2020 10:39:49 -0400 Subject: [PATCH] nameserver: Don't require secrets secrets/nameserver.yml is only required if we're using DDNS Signed-off-by: David Galloway --- roles/nameserver/tasks/main.yml | 5 ++++- roles/nameserver/vars/empty.yml | 7 +++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 roles/nameserver/vars/empty.yml diff --git a/roles/nameserver/tasks/main.yml b/roles/nameserver/tasks/main.yml index dbd83f34..2abf5c83 100644 --- a/roles/nameserver/tasks/main.yml +++ b/roles/nameserver/tasks/main.yml @@ -1,7 +1,10 @@ --- - name: Include secrets - include_vars: "{{ secrets_path | mandatory }}/nameserver.yml" + include_vars: "{{ item }}" no_log: true + with_first_found: + - "{{ secrets_path | mandatory }}/nameserver.yml" + - empty.yml tags: - always diff --git a/roles/nameserver/vars/empty.yml b/roles/nameserver/vars/empty.yml new file mode 100644 index 00000000..c6f9b195 --- /dev/null +++ b/roles/nameserver/vars/empty.yml @@ -0,0 +1,7 @@ +--- +# This is empty on purpose. Used as the last line +# when using include_vars with with_first_found when +# the var file might not exist. +# +# Maybe related issue: +# https://github.com/ansible/ansible/issues/10000 -- 2.47.3