From 34a4c57dd46ce1496b084b30b4dc5705d69f3a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Patrik=20Polakovi=C4=8D?= <patrik@alphamail.org>
Date: Mon, 4 Sep 2023 11:25:38 +0200
Subject: [PATCH] Zabbix: Add zabbix agent to groups/mirrormanager playbook
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Patrik Polakovič <patrik@alphamail.org>
---
 playbooks/groups/mirrormanager.yml | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml
index 1ea7e85eed..60e17ffb5d 100644
--- a/playbooks/groups/mirrormanager.yml
+++ b/playbooks/groups/mirrormanager.yml
@@ -8,21 +8,22 @@
   gather_facts: True
 
   vars_files:
-   - /srv/web/infra/ansible/vars/global.yml
-   - "/srv/private/ansible/vars.yml"
-   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
+  - /srv/web/infra/ansible/vars/global.yml
+  - "/srv/private/ansible/vars.yml"
+  - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   roles:
   - base
   - rkhunter
   - nagios_client
+  - {role: zabbix/zabbix_agent, when: env == "staging"}
   - hosts
-  - { role: openvpn/client, when: env != "staging" and inventory_hostname.startswith('mm-frontend')  }
+  - {role: openvpn/client, when: env != "staging" and inventory_hostname.startswith('mm-frontend')}
   - ipa/client
   - sudo
   - collectd/base
-  - { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub',  nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub', mount_stg: true }
-  - { role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub/archive',  nfs_src_dir: 'fedora_ftp_archive', mount_stg: true }
+  - {role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub', nfs_src_dir: 'fedora_ftp/fedora.redhat.com/pub', mount_stg: true}
+  - {role: nfs/client, when: inventory_hostname.startswith('mm-backend01'), mnt_dir: '/srv/pub/archive', nfs_src_dir: 'fedora_ftp_archive', mount_stg: true}
 
   pre_tasks:
   - import_tasks: "{{ tasks_path }}/yumrepos.yml"
@@ -39,7 +40,7 @@
   gather_facts: True
 
   vars_files:
-  -  /srv/web/infra/ansible/vars/global.yml
+  - /srv/web/infra/ansible/vars/global.yml
   - "/srv/private/ansible/vars.yml"
   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
@@ -59,15 +60,15 @@
   gather_facts: True
 
   vars_files:
-  -  /srv/web/infra/ansible/vars/global.yml
+  - /srv/web/infra/ansible/vars/global.yml
   - "/srv/private/ansible/vars.yml"
   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
   roles:
   - mirrormanager/crawler
-  - { role: rsyncd,
-      when: env != "staging" }
-  - { role: openvpn/client, when: datacenter != "iad2" }
+  - {role: rsyncd,
+     when: env != "staging"}
+  - {role: openvpn/client, when: datacenter != "iad2"}
 
   handlers:
   - import_tasks: "{{ handlers_path }}/restart_services.yml"
@@ -78,7 +79,7 @@
   gather_facts: True
 
   vars_files:
-  -  /srv/web/infra/ansible/vars/global.yml
+  - /srv/web/infra/ansible/vars/global.yml
   - "/srv/private/ansible/vars.yml"
   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
@@ -96,7 +97,7 @@
   gather_facts: True
 
   vars_files:
-  -  /srv/web/infra/ansible/vars/global.yml
+  - /srv/web/infra/ansible/vars/global.yml
   - "/srv/private/ansible/vars.yml"
   - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml