From a83a274b261eb8f442b92df8739c42563ca6abac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexander=20K=C3=A4b?= <alexander.kaeb@h-da.de>
Date: Mon, 20 Feb 2023 17:40:20 +0100
Subject: [PATCH] Fix conditional syntax
---
tasks/filebeat.yml | 6 +++---
tasks/main.yml | 8 +++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/tasks/filebeat.yml b/tasks/filebeat.yml
index 9948b0c..4d87903 100644
--- a/tasks/filebeat.yml
+++ b/tasks/filebeat.yml
@@ -1,6 +1,6 @@
- name: Add filebeat repository (Debian | Ubuntu)
become: true
- when: {{ ansible_os_family == 'Debian' }}
+ when: ansible_os_family == 'Debian'
block:
- name: Ensure Apt Can Use Https
ansible.builtin.apt:
@@ -26,11 +26,11 @@
gpgcheck: true
gpgkey: 'https://artifacts.elastic.co/GPG-KEY-elasticsearch'
state: present
- when: {{ ansible_os_family == 'RedHat' }}
+ when: ansible_os_family == 'RedHat'
become: true
- name: Install filebeat package
ansible.builtin.package:
name: filebeat
state: present
- become: true
\ No newline at end of file
+ become: true
diff --git a/tasks/main.yml b/tasks/main.yml
index 8c43a4f..e896292 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -6,23 +6,25 @@
become: true
- name: Add sidecar repo (Debian | Ubuntu)
- when: {{ ansible_os_family == 'Debian' }}
+ when: ansible_os_family == 'Debian'
become: true
block:
- name: Download repository file
ansible.builtin.get_url:
url: "{{ sidecar_repo_urls['Debian'] }}"
dest: /tmp/graylog-sidecar-repository.deb
+ mode: 0644
- name: Add repository using dpkg
ansible.builtin.command:
cmd: dpkg -i /tmp/graylog-sidecar-repository.deb
+ changed_when: false
- name: Add sidecar repo (RedHat)
ansible.builtin.yum:
name: "{{ sidecar_repo_urls['RedHat'] }}"
state: present
- when: {{ ansible_os_family == 'RedHat' }}
+ when: ansible_os_family == 'RedHat'
become: true
- name: Install sidecar package
@@ -57,7 +59,7 @@
- name: Install filebeat
ansible.builtin.import_tasks:
- filebeat.yml
- when: {{ install_filebeat }}
+ when: install_filebeat
- name: Switch back to default policy
ansible.builtin.command:
--
GitLab