[PATCH 3/3] Refactor the condition to setup the watchdog with a block
From: Michael Scherer <misc(a)zarb.org>
---
roles/base/tasks/watchdog.yml | 52 +++++++++++++++++++++----------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/roles/base/tasks/watchdog.yml b/roles/base/tasks/watchdog.yml
index feebcfc..148c856 100644
--- a/roles/base/tasks/watchdog.yml
+++ b/roles/base/tasks/watchdog.yml
@@ -3,32 +3,32 @@
when: ansible_virtualization_role == 'guest'
register: watchdog_dev
-- name: install watchdog
- package: pkg={{ item }} state=present
- with_items:
- - watchdog
- tags:
- - packages
- - watchdog
- - base
- when: ansible_virtualization_role == 'guest' and watchdog_dev.stat.exists
+- block:
-- name: watchdog device configuration
- copy: src=watchdog.conf dest=/etc/watchdog.conf owner=root group=root mode=644
- when: ansible_virtualization_role == 'guest' and watchdog_dev.stat.exists
- tags:
- - config
- - watchdog
- - base
- notify: restart watchdog
+ - name: install watchdog
+ package: pkg={{ item }} state=present
+ with_items:
+ - watchdog
+ tags:
+ - packages
+ - watchdog
+ - base
+
+ - name: watchdog device configuration
+ copy: src=watchdog.conf dest=/etc/watchdog.conf owner=root group=root mode=644
+ tags:
+ - config
+ - watchdog
+ - base
+ notify: restart watchdog
-- name: Set watchdog to run on boot
- service: name=watchdog enabled=yes
+ - name: Set watchdog to run on boot
+ service: name=watchdog enabled=yes
+ ignore_errors: true
+ notify:
+ - restart watchdog
+ tags:
+ - service
+ - watchdog
+ - base
when: ansible_virtualization_role == 'guest' and watchdog_dev.stat.exists
- ignore_errors: true
- notify:
- - restart watchdog
- tags:
- - service
- - watchdog
- - base
--
1.8.3.1