aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/roles
diff options
context:
space:
mode:
authorEgor Tensin <Egor.Tensin@gmail.com>2021-08-09 13:27:49 +0300
committerEgor Tensin <Egor.Tensin@gmail.com>2021-08-09 13:27:49 +0300
commit3f9051b964f7e1d40184dc2edbfba53906d2a77b (patch)
treec47e3631a3fc6538c30bd4c8343ae13d238f552b /roles
parentflush_handlers where needed (diff)
downloadmaintenance-3f9051b964f7e1d40184dc2edbfba53906d2a77b.tar.gz
maintenance-3f9051b964f7e1d40184dc2edbfba53906d2a77b.zip
join handlers using listen: topic
Diffstat (limited to 'roles')
-rw-r--r--roles/apt/handlers/main.yml3
-rw-r--r--roles/apt/tasks/main.yml8
-rw-r--r--roles/pacman/handlers/main.yml3
-rw-r--r--roles/pacman/tasks/main.yml8
4 files changed, 10 insertions, 12 deletions
diff --git a/roles/apt/handlers/main.yml b/roles/apt/handlers/main.yml
index 9dd7b9f..e7fa3e9 100644
--- a/roles/apt/handlers/main.yml
+++ b/roles/apt/handlers/main.yml
@@ -1,8 +1,11 @@
- name: Reboot
reboot:
+ # Don't reboot yourself accidentally:
when: 'ansible_env["SSH_CLIENT"].split()[0] not in ansible_all_ipv4_addresses'
+ listen: reboot
- name: Wait for connectivity
# One of the nodes is the VPN server connecting all the other nodes, wait
# until all of them are back up:
wait_for_connection:
+ listen: reboot
diff --git a/roles/apt/tasks/main.yml b/roles/apt/tasks/main.yml
index f00d4fd..6fd9e3e 100644
--- a/roles/apt/tasks/main.yml
+++ b/roles/apt/tasks/main.yml
@@ -11,9 +11,7 @@
- name: Upgrade packages
apt:
upgrade: full
- notify:
- - Reboot
- - Wait for connectivity
+ notify: reboot
- name: Flush handlers
meta: flush_handlers
@@ -22,9 +20,7 @@
apt:
autoremove: yes
purge: yes
- notify:
- - Reboot
- - Wait for connectivity
+ notify: reboot
- name: Flush handlers
meta: flush_handlers
diff --git a/roles/pacman/handlers/main.yml b/roles/pacman/handlers/main.yml
index 9dd7b9f..e7fa3e9 100644
--- a/roles/pacman/handlers/main.yml
+++ b/roles/pacman/handlers/main.yml
@@ -1,8 +1,11 @@
- name: Reboot
reboot:
+ # Don't reboot yourself accidentally:
when: 'ansible_env["SSH_CLIENT"].split()[0] not in ansible_all_ipv4_addresses'
+ listen: reboot
- name: Wait for connectivity
# One of the nodes is the VPN server connecting all the other nodes, wait
# until all of them are back up:
wait_for_connection:
+ listen: reboot
diff --git a/roles/pacman/tasks/main.yml b/roles/pacman/tasks/main.yml
index fe56fea..31b4352 100644
--- a/roles/pacman/tasks/main.yml
+++ b/roles/pacman/tasks/main.yml
@@ -12,9 +12,7 @@
community.general.pacman:
update_cache: yes
upgrade: yes
- notify:
- - Reboot
- - Wait for connectivity
+ notify: reboot
- name: Flush handlers
meta: flush_handlers
@@ -47,9 +45,7 @@
community.general.pacman:
update_cache: yes
upgrade: yes
- notify:
- - Reboot
- - Wait for connectivity
+ notify: reboot
- name: Flush handlers
meta: flush_handlers