From ecb6482396c969c6e0eb3e06c182c7bfb91d54fe Mon Sep 17 00:00:00 2001
From: Emil Renner Berthing <esmil@labitat.dk>
Date: Thu, 27 Feb 2020 20:01:17 +0100
Subject: roles: remove useless |bool filters
This used to be a fix for some bogus warnings, but
they seem to have gone in recent versions of Ansible
---
roles/debian/tasks/hostname.yml | 2 +-
roles/debian/tasks/main.yml | 2 +-
roles/debian/tasks/networkd.yml | 8 ++++----
roles/debian/tasks/resolved.yml | 8 ++++----
roles/debian/tasks/sshd.yml | 2 +-
roles/debian/tasks/timesyncd.yml | 2 +-
roles/debian/tasks/timezone.yml | 2 +-
roles/fedora/tasks/dnf.yml | 2 +-
roles/fedora/tasks/hostname.yml | 2 +-
roles/fedora/tasks/networkd.yml | 2 +-
roles/fedora/tasks/resolved.yml | 8 ++++----
roles/fedora/tasks/sshd.yml | 2 +-
roles/fedora/tasks/timesyncd.yml | 2 +-
roles/fedora/tasks/timezone.yml | 2 +-
roles/jumbotron/tasks/console.yml | 2 +-
roles/raspbian/tasks/apt.yml | 2 +-
roles/raspbian/tasks/networkd.yml | 2 +-
roles/space_server/tasks/avahi.yml | 2 +-
roles/space_server/tasks/bird.yml | 2 +-
roles/space_server/tasks/dhcpd.yml | 2 +-
roles/space_server/tasks/gettys.yml | 4 ++--
roles/space_server/tasks/named.yml | 2 +-
roles/space_server/tasks/nftables.yml | 2 +-
roles/space_server/tasks/radius.yml | 4 ++--
24 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/roles/debian/tasks/hostname.yml b/roles/debian/tasks/hostname.yml
index 214f243..6709c03 100644
--- a/roles/debian/tasks/hostname.yml
+++ b/roles/debian/tasks/hostname.yml
@@ -10,6 +10,6 @@
owner: root
group: root
mode: 0644
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/debian/tasks/main.yml b/roles/debian/tasks/main.yml
index 407040e..71637c1 100644
--- a/roles/debian/tasks/main.yml
+++ b/roles/debian/tasks/main.yml
@@ -3,7 +3,7 @@
tags: apt
- import_tasks: tmpfs.yml
tags: tmpfs
- when: use_tmpfs|bool
+ when: use_tmpfs
- import_tasks: hosts.yml
tags: hosts
- import_tasks: timezone.yml
diff --git a/roles/debian/tasks/networkd.yml b/roles/debian/tasks/networkd.yml
index 49b3041..bed76a0 100644
--- a/roles/debian/tasks/networkd.yml
+++ b/roles/debian/tasks/networkd.yml
@@ -10,7 +10,7 @@
value: "{{ (item.value is string)|ternary(item.value,omit) }}"
state: "{{ (item.value is string)|ternary('present','absent') }}"
with_dict: '{{ networkd_conf }}'
- when: use_networkd|bool
+ when: use_networkd
- name: Enable/disable systemd-networkd
systemd:
@@ -23,7 +23,7 @@
when: not chroot
- name: '- when in chroot'
command: "systemctl {{ use_networkd|ternary('enable','disable') }} systemd-networkd.service"
- when: chroot|bool
+ when: chroot
# in Debian 9 (stretch) we need to enable this manually
# this is fixed in buster though
@@ -35,7 +35,7 @@
when: apt_release|default(ansible_distribution_release) == 'stretch' and not chroot
- name: '- when in chroot'
command: "systemctl {{ use_networkd|ternary('enable','disable') }} systemd-networkd-wait-online.service"
- when: apt_release|default(ansible_distribution_release) == 'stretch' and chroot|bool
+ when: apt_release|default(ansible_distribution_release) == 'stretch' and chroot
# use RequiredForOnline in systemd.network files if possible,
# but for older systemd's set networkd_ignore: ['eth0', 'eth1']
@@ -66,6 +66,6 @@
block:
- command: systemctl disable networking.service
- command: systemctl mask networking.service
- when: use_networkd|bool and chroot|bool
+ when: use_networkd and chroot|bool
# vim: set ts=2 sw=2 et:
diff --git a/roles/debian/tasks/resolved.yml b/roles/debian/tasks/resolved.yml
index 9b8d589..35c2cf6 100644
--- a/roles/debian/tasks/resolved.yml
+++ b/roles/debian/tasks/resolved.yml
@@ -10,7 +10,7 @@
value: "{{ (item.value is string)|ternary(item.value,omit) }}"
state: "{{ (item.value is string)|ternary('present','absent') }}"
with_dict: '{{ resolved_conf }}'
- when: use_resolved|bool
+ when: use_resolved
notify: restart resolved
- name: Enable/disable systemd-resolved
@@ -22,7 +22,7 @@
when: not chroot
- name: '- when in chroot'
command: "systemctl {{ use_resolved|ternary('enable','disable') }} systemd-resolved.service"
- when: chroot|bool
+ when: chroot
- name: Symlink /etc/resolv.conf
file:
@@ -30,12 +30,12 @@
src: '/run/systemd/resolve/resolv.conf'
state: link
force: yes
- when: use_resolved|bool
+ when: use_resolved
- name: Use myhostname and possibly resolved nss plugins
lineinfile:
path: /etc/nsswitch.conf
regexp: '^hosts:'
line: 'hosts: files resolve [!UNAVAIL=return] dns myhostname'
- when: use_resolved|bool
+ when: use_resolved
# vim: set ts=2 sw=2 et:
diff --git a/roles/debian/tasks/sshd.yml b/roles/debian/tasks/sshd.yml
index 03f3279..4e06efe 100644
--- a/roles/debian/tasks/sshd.yml
+++ b/roles/debian/tasks/sshd.yml
@@ -46,6 +46,6 @@
when: not chroot
- name: '- when in chroot'
command: systemctl enable ssh.service
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/debian/tasks/timesyncd.yml b/roles/debian/tasks/timesyncd.yml
index 17693c3..8b53cab 100644
--- a/roles/debian/tasks/timesyncd.yml
+++ b/roles/debian/tasks/timesyncd.yml
@@ -22,6 +22,6 @@
when: not chroot
- name: '- when in chroot'
command: systemctl enable systemd-timesyncd.service
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/debian/tasks/timezone.yml b/roles/debian/tasks/timezone.yml
index efe6546..a917dd4 100644
--- a/roles/debian/tasks/timezone.yml
+++ b/roles/debian/tasks/timezone.yml
@@ -9,6 +9,6 @@
src: '../usr/share/zoneinfo/{{ timezone }}'
state: link
force: yes
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/fedora/tasks/dnf.yml b/roles/fedora/tasks/dnf.yml
index 73f5b4b..50f11ec 100644
--- a/roles/fedora/tasks/dnf.yml
+++ b/roles/fedora/tasks/dnf.yml
@@ -47,6 +47,6 @@
when: not chroot
- name: '- when in chroot'
command: "systemctl {{ dnf_makecache|ternary('enable','disable') }} dnf-makecache.timer"
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/fedora/tasks/hostname.yml b/roles/fedora/tasks/hostname.yml
index 214f243..6709c03 100644
--- a/roles/fedora/tasks/hostname.yml
+++ b/roles/fedora/tasks/hostname.yml
@@ -10,6 +10,6 @@
owner: root
group: root
mode: 0644
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/fedora/tasks/networkd.yml b/roles/fedora/tasks/networkd.yml
index d643233..de38fa4 100644
--- a/roles/fedora/tasks/networkd.yml
+++ b/roles/fedora/tasks/networkd.yml
@@ -10,6 +10,6 @@
when: not chroot
- name: '- when in chroot'
command: "systemctl {{ use_networkd|ternary('enable','disable') }} systemd-networkd.service"
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/fedora/tasks/resolved.yml b/roles/fedora/tasks/resolved.yml
index 9b8d589..35c2cf6 100644
--- a/roles/fedora/tasks/resolved.yml
+++ b/roles/fedora/tasks/resolved.yml
@@ -10,7 +10,7 @@
value: "{{ (item.value is string)|ternary(item.value,omit) }}"
state: "{{ (item.value is string)|ternary('present','absent') }}"
with_dict: '{{ resolved_conf }}'
- when: use_resolved|bool
+ when: use_resolved
notify: restart resolved
- name: Enable/disable systemd-resolved
@@ -22,7 +22,7 @@
when: not chroot
- name: '- when in chroot'
command: "systemctl {{ use_resolved|ternary('enable','disable') }} systemd-resolved.service"
- when: chroot|bool
+ when: chroot
- name: Symlink /etc/resolv.conf
file:
@@ -30,12 +30,12 @@
src: '/run/systemd/resolve/resolv.conf'
state: link
force: yes
- when: use_resolved|bool
+ when: use_resolved
- name: Use myhostname and possibly resolved nss plugins
lineinfile:
path: /etc/nsswitch.conf
regexp: '^hosts:'
line: 'hosts: files resolve [!UNAVAIL=return] dns myhostname'
- when: use_resolved|bool
+ when: use_resolved
# vim: set ts=2 sw=2 et:
diff --git a/roles/fedora/tasks/sshd.yml b/roles/fedora/tasks/sshd.yml
index 603fbf9..91f08ec 100644
--- a/roles/fedora/tasks/sshd.yml
+++ b/roles/fedora/tasks/sshd.yml
@@ -46,6 +46,6 @@
when: not chroot
- name: '- when in chroot'
command: systemctl enable sshd.service
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/fedora/tasks/timesyncd.yml b/roles/fedora/tasks/timesyncd.yml
index 17693c3..8b53cab 100644
--- a/roles/fedora/tasks/timesyncd.yml
+++ b/roles/fedora/tasks/timesyncd.yml
@@ -22,6 +22,6 @@
when: not chroot
- name: '- when in chroot'
command: systemctl enable systemd-timesyncd.service
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/fedora/tasks/timezone.yml b/roles/fedora/tasks/timezone.yml
index efe6546..a917dd4 100644
--- a/roles/fedora/tasks/timezone.yml
+++ b/roles/fedora/tasks/timezone.yml
@@ -9,6 +9,6 @@
src: '../usr/share/zoneinfo/{{ timezone }}'
state: link
force: yes
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/jumbotron/tasks/console.yml b/roles/jumbotron/tasks/console.yml
index 8cbd190..42ec011 100644
--- a/roles/jumbotron/tasks/console.yml
+++ b/roles/jumbotron/tasks/console.yml
@@ -41,6 +41,6 @@
when: not chroot
- name: '- when in chroot'
command: systemctl enable console-setup.service
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/raspbian/tasks/apt.yml b/roles/raspbian/tasks/apt.yml
index f9a4115..2d88800 100644
--- a/roles/raspbian/tasks/apt.yml
+++ b/roles/raspbian/tasks/apt.yml
@@ -13,6 +13,6 @@
with_items:
- apt-daily.timer
- apt-daily-upgrade.timer
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/raspbian/tasks/networkd.yml b/roles/raspbian/tasks/networkd.yml
index c372a5c..bfff12d 100644
--- a/roles/raspbian/tasks/networkd.yml
+++ b/roles/raspbian/tasks/networkd.yml
@@ -3,6 +3,6 @@
file:
path: '/etc/systemd/system/dhcpcd.service.d'
state: absent
- when: use_networkd|bool
+ when: use_networkd
# vim: set ts=2 sw=2 et:
diff --git a/roles/space_server/tasks/avahi.yml b/roles/space_server/tasks/avahi.yml
index 30e10dc..ca0cf63 100644
--- a/roles/space_server/tasks/avahi.yml
+++ b/roles/space_server/tasks/avahi.yml
@@ -50,7 +50,7 @@
command: systemctl enable avahi-daemon.service
args:
creates: '/etc/systemd/system/multi-user.target.wants/avahi-daemon.service'
- when: chroot|bool
+ when: chroot
- name: Use nss-mdns
lineinfile:
diff --git a/roles/space_server/tasks/bird.yml b/roles/space_server/tasks/bird.yml
index d61a709..4ce01eb 100644
--- a/roles/space_server/tasks/bird.yml
+++ b/roles/space_server/tasks/bird.yml
@@ -63,6 +63,6 @@
with_items:
- bird
- bird6
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/space_server/tasks/dhcpd.yml b/roles/space_server/tasks/dhcpd.yml
index e591a85..79d2f0f 100644
--- a/roles/space_server/tasks/dhcpd.yml
+++ b/roles/space_server/tasks/dhcpd.yml
@@ -20,6 +20,6 @@
command: systemctl enable dhcpd.service
args:
creates: '/etc/systemd/system/multi-user.target.wants/dhcpd.service'
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/space_server/tasks/gettys.yml b/roles/space_server/tasks/gettys.yml
index 2d2511a..ea351f4 100644
--- a/roles/space_server/tasks/gettys.yml
+++ b/roles/space_server/tasks/gettys.yml
@@ -9,7 +9,7 @@
command: systemctl disable getty@tty1.service
args:
removes: '/etc/systemd/system/getty.target.wants/getty@tty1.service'
- when: chroot|bool
+ when: chroot
- name: Enable serial-getty@ttyS0
systemd:
@@ -20,6 +20,6 @@
command: systemctl enable serial-getty@ttyS0.service
args:
creates: '/etc/systemd/system/getty.target.wants/serial-getty@ttyS0.service'
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/space_server/tasks/named.yml b/roles/space_server/tasks/named.yml
index 30ab544..93f230f 100644
--- a/roles/space_server/tasks/named.yml
+++ b/roles/space_server/tasks/named.yml
@@ -65,7 +65,7 @@
when: not chroot
- name: '- when in chroot'
command: systemctl enable named.service
- when: chroot|bool
+ when: chroot
- name: Use our own resolver
copy:
diff --git a/roles/space_server/tasks/nftables.yml b/roles/space_server/tasks/nftables.yml
index 67d0864..9c56714 100644
--- a/roles/space_server/tasks/nftables.yml
+++ b/roles/space_server/tasks/nftables.yml
@@ -37,6 +37,6 @@
command: systemctl enable nftables.service
args:
creates: '/etc/systemd/system/multi-user.target.wants/nftables.service'
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
diff --git a/roles/space_server/tasks/radius.yml b/roles/space_server/tasks/radius.yml
index f918052..a3f4183 100644
--- a/roles/space_server/tasks/radius.yml
+++ b/roles/space_server/tasks/radius.yml
@@ -98,7 +98,7 @@
command: systemctl enable getusers.timer
args:
creates: '/etc/systemd/system/timers.target.wants/getusers.timer'
- when: chroot|bool
+ when: chroot
- name: Create service drop-in directory
file:
@@ -127,6 +127,6 @@
command: systemctl enable radiusd.service
args:
creates: '/etc/systemd/system/multi-user.target.wants/radiusd.service'
- when: chroot|bool
+ when: chroot
# vim: set ts=2 sw=2 et:
--
cgit v1.2.1