From 2f51ad4c36a10a3e1cb7256351ee1cdf031bf6ca Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 9 Aug 2021 13:38:14 +0300 Subject: factor out handlers to role "common" --- roles/apt/handlers/main.yml | 11 ----------- roles/apt/meta/main.yml | 2 ++ roles/common/handlers/main.yml | 11 +++++++++++ roles/pacman/handlers/main.yml | 11 ----------- roles/pacman/meta/main.yml | 2 ++ 5 files changed, 15 insertions(+), 22 deletions(-) delete mode 100644 roles/apt/handlers/main.yml create mode 100644 roles/apt/meta/main.yml create mode 100644 roles/common/handlers/main.yml delete mode 100644 roles/pacman/handlers/main.yml create mode 100644 roles/pacman/meta/main.yml diff --git a/roles/apt/handlers/main.yml b/roles/apt/handlers/main.yml deleted file mode 100644 index e7fa3e9..0000000 --- a/roles/apt/handlers/main.yml +++ /dev/null @@ -1,11 +0,0 @@ -- 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/meta/main.yml b/roles/apt/meta/main.yml new file mode 100644 index 0000000..9711b33 --- /dev/null +++ b/roles/apt/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: common diff --git a/roles/common/handlers/main.yml b/roles/common/handlers/main.yml new file mode 100644 index 0000000..e7fa3e9 --- /dev/null +++ b/roles/common/handlers/main.yml @@ -0,0 +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/handlers/main.yml b/roles/pacman/handlers/main.yml deleted file mode 100644 index e7fa3e9..0000000 --- a/roles/pacman/handlers/main.yml +++ /dev/null @@ -1,11 +0,0 @@ -- 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/meta/main.yml b/roles/pacman/meta/main.yml new file mode 100644 index 0000000..9711b33 --- /dev/null +++ b/roles/pacman/meta/main.yml @@ -0,0 +1,2 @@ +dependencies: + - role: common -- cgit v1.2.3