From 54c17262f1c4b6854c4b21dec76f5c60ca887698 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Mon, 20 Jan 2020 16:46:58 +0100
Subject: [PATCH] Use apply.tags for include_tasks
Otherwise the included tasks won't be applied when using tags,
see https://github.com/ansible/ansible/issues/30882#issuecomment-479214591
---
ansible/roles/apps/tasks/cert-manager.yml | 8 +++++++-
ansible/roles/apps/tasks/local-storage.yml | 8 +++++++-
ansible/roles/apps/tasks/nextcloud.yml | 16 ++++++++++++++--
ansible/roles/apps/tasks/nginx.yml | 8 +++++++-
ansible/roles/apps/tasks/prometheus.yml | 9 ++++++++-
ansible/roles/apps/tasks/rocketchat.yml | 8 +++++++-
ansible/roles/apps/tasks/single-sign-on.yml | 8 +++++++-
ansible/roles/apps/tasks/wordpress.yml | 17 +++++++++++++++--
8 files changed, 72 insertions(+), 10 deletions(-)
diff --git a/ansible/roles/apps/tasks/cert-manager.yml b/ansible/roles/apps/tasks/cert-manager.yml
index 7bcf98be2..055cb85c4 100644
--- a/ansible/roles/apps/tasks/cert-manager.yml
+++ b/ansible/roles/apps/tasks/cert-manager.yml
@@ -54,4 +54,10 @@
flux:
name: "cert-manager-settings"
namespace: "oas"
- include_tasks: flux_secret.yml
+ include_tasks:
+ file: flux_secret.yml
+ apply:
+ tags:
+ - config
+ - flux
+ - cert-manager
diff --git a/ansible/roles/apps/tasks/local-storage.yml b/ansible/roles/apps/tasks/local-storage.yml
index 99b67ed82..22e9c1325 100644
--- a/ansible/roles/apps/tasks/local-storage.yml
+++ b/ansible/roles/apps/tasks/local-storage.yml
@@ -8,4 +8,10 @@
flux:
name: "local-storage-settings"
namespace: "oas"
- include_tasks: flux_secret.yml
+ include_tasks:
+ file: flux_secret.yml
+ apply:
+ tags:
+ - config
+ - flux
+ - local-storage
diff --git a/ansible/roles/apps/tasks/nextcloud.yml b/ansible/roles/apps/tasks/nextcloud.yml
index a635295a2..a591e63c5 100644
--- a/ansible/roles/apps/tasks/nextcloud.yml
+++ b/ansible/roles/apps/tasks/nextcloud.yml
@@ -7,7 +7,13 @@
vars:
flux:
name: "nextcloud-settings"
- include_tasks: flux_secret.yml
+ include_tasks:
+ file: flux_secret.yml
+ apply:
+ tags:
+ - config
+ - flux
+ - nextcloud
- name: Create persistent volumes for nextcloud data and metadata
tags:
@@ -19,7 +25,13 @@
name: "nextcloud-{{ item.name }}"
namespace: "oas-apps"
size: "{{ item.size }}"
- include_tasks: pvc.yml
+ include_tasks:
+ file: pvc.yml
+ apply:
+ tags:
+ - config
+ - nextcloud
+ - storage
with_items:
- name: "files"
size: 2Gi
diff --git a/ansible/roles/apps/tasks/nginx.yml b/ansible/roles/apps/tasks/nginx.yml
index 4e4f75bc6..99c019ba8 100644
--- a/ansible/roles/apps/tasks/nginx.yml
+++ b/ansible/roles/apps/tasks/nginx.yml
@@ -9,4 +9,10 @@
flux:
name: "ingress-settings"
namespace: "oas"
- include_tasks: flux_secret.yml
+ include_tasks:
+ file: flux_secret.yml
+ apply:
+ tags:
+ - config
+ - flux
+ - nginx
diff --git a/ansible/roles/apps/tasks/prometheus.yml b/ansible/roles/apps/tasks/prometheus.yml
index dbf3e64e2..af180c975 100644
--- a/ansible/roles/apps/tasks/prometheus.yml
+++ b/ansible/roles/apps/tasks/prometheus.yml
@@ -40,4 +40,11 @@
flux:
name: "monitoring-settings"
namespace: "oas"
- include_tasks: flux_secret.yml
+ include_tasks:
+ file: flux_secret.yml
+ apply:
+ tags:
+ - config
+ - flux
+ - monitoring
+ - prometheus
diff --git a/ansible/roles/apps/tasks/rocketchat.yml b/ansible/roles/apps/tasks/rocketchat.yml
index f5f28ffbe..5efe0efd3 100644
--- a/ansible/roles/apps/tasks/rocketchat.yml
+++ b/ansible/roles/apps/tasks/rocketchat.yml
@@ -8,4 +8,10 @@
vars:
flux:
name: "rocketchat-settings"
- include_tasks: flux_secret.yml
+ include_tasks:
+ file: flux_secret.yml
+ apply:
+ tags:
+ - config
+ - flux
+ - rocketchat
diff --git a/ansible/roles/apps/tasks/single-sign-on.yml b/ansible/roles/apps/tasks/single-sign-on.yml
index 799fb1949..69a5c9698 100644
--- a/ansible/roles/apps/tasks/single-sign-on.yml
+++ b/ansible/roles/apps/tasks/single-sign-on.yml
@@ -9,4 +9,10 @@
flux:
name: "single-sign-on-settings"
namespace: "oas"
- include_tasks: flux_secret.yml
+ include_tasks:
+ file: flux_secret.yml
+ apply:
+ tags:
+ - config
+ - flux
+ - single-sign-on
diff --git a/ansible/roles/apps/tasks/wordpress.yml b/ansible/roles/apps/tasks/wordpress.yml
index 01042beba..65f54fc0f 100644
--- a/ansible/roles/apps/tasks/wordpress.yml
+++ b/ansible/roles/apps/tasks/wordpress.yml
@@ -7,7 +7,14 @@
vars:
flux:
name: "wordpress-settings"
- include_tasks: flux_secret.yml
+ include_tasks:
+ file: flux_secret.yml
+ apply:
+ tags:
+ - config
+ - flux
+ - wordpress
+
- name: Create persistent volumes for wordpress data and metadata
tags:
@@ -19,7 +26,13 @@
name: "wordpress-{{ item.name }}"
namespace: "oas-apps"
size: "{{ item.size }}"
- include_tasks: pvc.yml
+ include_tasks:
+ file: pvc.yml
+ apply:
+ tags:
+ - config
+ - wordpress
+ - storage
with_items:
- name: "files"
size: 2Gi
--
GitLab