From b0291072a2c7dacb0d089dd15a7461e5d69efd1c Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Tue, 1 Mar 2022 22:17:55 +0200
Subject: [PATCH] Nicer use of variables.
---
Ansible/roles/debian_server/tasks/btrfs.yml | 13 ++++---------
.../debian_server/templates/btrfs_check.service.j2 | 2 +-
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/Ansible/roles/debian_server/tasks/btrfs.yml b/Ansible/roles/debian_server/tasks/btrfs.yml
index aac0ef6..cc7952b 100644
--- a/Ansible/roles/debian_server/tasks/btrfs.yml
+++ b/Ansible/roles/debian_server/tasks/btrfs.yml
@@ -1,13 +1,4 @@
---
-- name: Find a mountpoint for {{ device }}
- # There can be multiple once with bind mounts or subvolumes, we only need
- # one.
- set_fact:
- # yamllint disable rule:line-length
- btrfs_mountpoint: |-
- {{ (ansible_facts.mounts|selectattr("device", "equalto", device)|first)["mount"] }}
- # yamllint enable rule:line-length
-
- name: Install btrfs packages
apt:
cache_valid_time: 3600
@@ -34,6 +25,10 @@
src: btrfs_scrub.{{ item }}.j2
vars: &vars
name: '{{ device|replace("/", "_") }}'
+ # yamllint disable rule:line-length
+ mountpoint: |-
+ {{ (ansible_facts.mounts|selectattr("device", "equalto", device)|first)["mount"] }}
+ # yamllint enable rule:line-length
tags: [scrub]
- name: Enable btrfs scrub timers
diff --git a/Ansible/roles/debian_server/templates/btrfs_check.service.j2 b/Ansible/roles/debian_server/templates/btrfs_check.service.j2
index 232a084..d719989 100644
--- a/Ansible/roles/debian_server/templates/btrfs_check.service.j2
+++ b/Ansible/roles/debian_server/templates/btrfs_check.service.j2
@@ -6,4 +6,4 @@ After=network-online.target
[Service]
Type=exec
-ExecStart=mnpw --warn -- /usr/lib/nagios-btrfs/plugins/check_btrfs --mountpoint {{ btrfs_mountpoint }}
+ExecStart=mnpw --warn -- /usr/lib/nagios-btrfs/plugins/check_btrfs --mountpoint {{ mountpoint }}
--
GitLab