From 9b415d7c071d8ffc4291b92b92cd1f1cf51c5ebf Mon Sep 17 00:00:00 2001
From: Chris Croome <chris@webarchitects.co.uk>
Date: Fri, 4 Oct 2024 15:58:06 +0100
Subject: [PATCH] updates for ANSIBLE_INJECT_FACT_VARS: "0"
---
tasks/install.yml | 8 ++++----
templates/icinga.sources.j2 | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tasks/install.yml b/tasks/install.yml
index e9534ac..d275827 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -34,10 +34,10 @@
pkg:
- monitoring-plugins-systemd
state: present
- default_release: "{{ ansible_distribution_release }}-backports"
+ default_release: "{{ ansible_facts.distribution_release }}-backports"
update_cache: false
when:
- - ansible_distribution_release == "bullseye"
+ - ansible_facts.distribution_release == "bullseye"
- icinga_plugin_systemd.rc == 0
- name: Bookworm packages present
@@ -45,7 +45,7 @@
pkg:
- monitoring-plugins-systemd
state: present
- when: ansible_distribution_release is regex('^bookworm|jessie|noble|trixie$')
+ when: ansible_facts.distribution_release is regex('^bookworm|jessie|noble|trixie$')
- name: Check if /usr/lib/nagios/plugins/check_systemd exists
ansible.builtin.stat:
@@ -84,7 +84,7 @@
- icinga2-common
- vim-icinga2
state: latest
- default_release: "icinga-{{ ansible_distribution_release }}"
+ default_release: "icinga-{{ ansible_facts.distribution_release }}"
update_cache: false
- name: Icinga2 vim syntax highlighting directory present
diff --git a/templates/icinga.sources.j2 b/templates/icinga.sources.j2
index 6072087..047c2aa 100644
--- a/templates/icinga.sources.j2
+++ b/templates/icinga.sources.j2
@@ -1,8 +1,8 @@
# {{ ansible_managed }}
Types: deb
-URIs: https://packages.icinga.com/{{ ansible_distribution | lower }}
-Suites: icinga-{{ ansible_distribution_release }}
+URIs: https://packages.icinga.com/{{ ansible_facts.distribution | lower }}
+Suites: icinga-{{ ansible_facts.distribution_release }}
Architectures: {{ ansible_facts.ansible_local.dpkg.arch }}
Components: main
Signed-By: /etc/apt/keyrings/icinga.gpg
--
GitLab