From 9296dfd8abc961894f340588299be510230b2313 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=A4b?= <alexander.kaeb@h-da.de>
Date: Mon, 19 Aug 2024 12:21:59 +0200
Subject: [PATCH] fix: include conditions for node cert tasks
---
tasks/main.yml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index e9f30e6..fda4ad4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -64,18 +64,17 @@
- name: Generate Node certificates
when: generate_node_certs
block:
- - name: Include cert tasks (with gl-groups defined)
- when: (('sidecar-ca' in groups) and ('graylog-nodes' in groups))
+ - name: Include cert tasks
+ when: (('sidecar-ca' in groups) and ('graylog-nodes' in groups)) and not 'ca-store' in groups
block:
- - name: Include Node Cert tasks (with gl-groups defined)
+ - name: Include Node Cert tasks
ansible.builtin.include_tasks: node-certs.yml
when: >
(inventory_hostname not in groups['sidecar-ca']) and
- (inventory_hostname not in groups['graylog-nodes']) and
- (inventory_hostname not in groups['ca-store'])
-
+ (inventory_hostname not in groups['graylog-nodes'])
+
- name: Include cert tasks (without gl-groups defined)
- when: not (('sidecar-ca' in groups) and ('graylog-nodes' in groups))
+ when: not (('sidecar-ca' in groups) and ('graylog-nodes' in groups)) and 'ca-store' in groups
block:
- name: Include Node Cert tasks (without gl-groups defined)
ansible.builtin.include_tasks: node-certs.yml
--
GitLab