From cd022dafcca75259e507efa06aa2dcf9d11b5283 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 8 Nov 2017 12:02:46 +0100
Subject: [PATCH] ansible-playbooks/general#72 All includes are now
include_tasks and they always have a tag associated
---
handlers/main.yml | 3 ++-
tasks/main.yml | 8 +++++---
tasks/renew.yml | 3 ++-
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/handlers/main.yml b/handlers/main.yml
index 236af4c..3ed7b34 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -1,4 +1,5 @@
---
# file: roles/letsencrypt/handler/main.yml
-- import_tasks: '../../haproxy/handlers/main.yml'
+- include_tasks: '../../haproxy/handlers/main.yml'
+ tags: 'always'
diff --git a/tasks/main.yml b/tasks/main.yml
index 2df762b..1fbb40f 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,7 +3,7 @@
- name: "LetsEncrypt Role"
set_fact: role_letsencrypt_started=true
- tags: always
+ tags: 'always'
- block:
@@ -20,14 +20,16 @@
changed_when: false
tags: 'always'
- - import_tasks: install.yml
+ - include_tasks: install.yml
+ tags: 'always'
- include_tasks: cert.yml
with_items: '{{ letsencrypt_certificates|default([]) }}'
loop_control:
loop_var: domain
+ tags: 'always'
- - import_tasks: renew.yml
+ - include_tasks: renew.yml
when: letsencrypt_certs_available is defined and letsencrypt_certs_available.stat.exists and (proxy_active is not defined or proxy_active)
tags: 'renew'
diff --git a/tasks/renew.yml b/tasks/renew.yml
index b5583b2..fac4aef 100644
--- a/tasks/renew.yml
+++ b/tasks/renew.yml
@@ -34,7 +34,8 @@
state: 'absent'
- name: "Build HaProxy Certs"
- import_tasks: '../../haproxy/tasks/buildcerts.yml'
+ include_tasks: '../../haproxy/tasks/buildcerts.yml'
+ tags: 'always'
- name: "Start services"
service:
--
GitLab